From dceb977696a1baca4e40e1cf91ebbd2d14fdcaec Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 24 Dec 2025 23:27:42 +0100 Subject: [PATCH 01/29] fprintd: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/fp/fprintd/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fp/fprintd/package.nix b/pkgs/by-name/fp/fprintd/package.nix index 8f30b1437c8b..7682e45f07b2 100644 --- a/pkgs/by-name/fp/fprintd/package.nix +++ b/pkgs/by-name/fp/fprintd/package.nix @@ -80,12 +80,14 @@ stdenv.mkDerivation (finalAttrs: { "-Dsystemd_system_unit_dir=${placeholder "out"}/lib/systemd/system" ]; - PKG_CONFIG_DBUS_1_INTERFACES_DIR = "${placeholder "out"}/share/dbus-1/interfaces"; - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; - PKG_CONFIG_DBUS_1_DATADIR = "${placeholder "out"}/share"; + env = { + PKG_CONFIG_DBUS_1_INTERFACES_DIR = "${placeholder "out"}/share/dbus-1/interfaces"; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; + PKG_CONFIG_DBUS_1_DATADIR = "${placeholder "out"}/share"; - # FIXME: Ugly hack for tests to find libpam_wrapper.so - LIBRARY_PATH = lib.makeLibraryPath [ python3.pkgs.pypamtest ]; + # FIXME: Ugly hack for tests to find libpam_wrapper.so + LIBRARY_PATH = lib.makeLibraryPath [ python3.pkgs.pypamtest ]; + }; mesonCheckFlags = [ # PAM related checks are timing out From a10d9982461fbbe1acdc09e9991f17425d3b1980 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 24 Dec 2025 23:27:58 +0100 Subject: [PATCH 02/29] power-profiles-daemon: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/po/power-profiles-daemon/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/po/power-profiles-daemon/package.nix b/pkgs/by-name/po/power-profiles-daemon/package.nix index b303721afd81..fabb6ed3f710 100644 --- a/pkgs/by-name/po/power-profiles-daemon/package.nix +++ b/pkgs/by-name/po/power-profiles-daemon/package.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { # Only need to wrap the Python tool (powerprofilectl) dontWrapGApps = true; - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; + env.PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; postPatch = '' patchShebangs --build \ From ae6ed8da181f145e4e2da42a4c72a748bf01b85b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 24 Dec 2025 23:28:09 +0100 Subject: [PATCH 03/29] spice-gtk: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/sp/spice-gtk/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sp/spice-gtk/package.nix b/pkgs/by-name/sp/spice-gtk/package.nix index 301162b9c6ab..e3f545627bda 100644 --- a/pkgs/by-name/sp/spice-gtk/package.nix +++ b/pkgs/by-name/sp/spice-gtk/package.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { wayland-protocols ]; - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; + env.PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; mesonFlags = [ "-Dusb-acl-helper-dir=${placeholder "out"}/bin" From f319e05c41cf2486ebd9cd42ca5dc1260f450bbc Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:39:13 +0100 Subject: [PATCH 04/29] cdemu: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/applications/emulators/cdemu/libmirage.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix index 257ce5ea44ac..e2017be9616c 100644 --- a/pkgs/applications/emulators/cdemu/libmirage.nix +++ b/pkgs/applications/emulators/cdemu/libmirage.nix @@ -34,8 +34,11 @@ in stdenv.mkDerivation { inherit pname version src; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + env = { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + }; + buildInputs = [ glib libsndfile From 4f44c4ec9672385d3d36c6d354d8784a54eb76ff Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:48:15 +0100 Subject: [PATCH 05/29] pidginPackages: move PKG_CONFIG env variables into env for structuredAttrs --- .../pidgin/pidgin-plugins/purple-discord/default.nix | 6 ++++-- .../pidgin/pidgin-plugins/purple-googlechat/default.nix | 6 ++++-- .../pidgin/pidgin-plugins/purple-slack/default.nix | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix index 2e0202a2cc7b..90c4f10d6ded 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix @@ -28,8 +28,10 @@ stdenv.mkDerivation { json-glib ]; - PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; - PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; + env = { + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; + }; meta = { homepage = "https://github.com/EionRobb/purple-discord"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix index 274cc6dafcc2..5a52ce1fe8ab 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix @@ -28,8 +28,10 @@ stdenv.mkDerivation { protobuf ]; - PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; - PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; + env = { + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; + }; meta = { homepage = "https://github.com/EionRobb/purple-googlechat"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix index 89716495a135..e492c1f4ef9e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix @@ -20,8 +20,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin ]; - PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; - PKG_CONFIG_PURPLE_DATAROOTDIR = "${placeholder "out"}/share"; + env = { + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATAROOTDIR = "${placeholder "out"}/share"; + }; meta = { homepage = "https://github.com/dylex/slack-libpurple"; From ba352147ae89ad73a2d4adf767f121c29079ff55 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:49:33 +0100 Subject: [PATCH 06/29] evolution: move PKG_CONFIG env variables into env for structuredAttrs --- .../networking/mailreaders/evolution/evolution/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 8b1b9a3a83c5..1459a12b3712 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -144,8 +144,10 @@ stdenv.mkDerivation rec { }; }; - PKG_CONFIG_CAMEL_1_2_CAMEL_PROVIDERDIR = "${placeholder "out"}/lib/evolution-data-server/camel-providers"; - PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules"; + env = { + PKG_CONFIG_CAMEL_1_2_CAMEL_PROVIDERDIR = "${placeholder "out"}/lib/evolution-data-server/camel-providers"; + PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules"; + }; meta = { homepage = "https://gitlab.gnome.org/GNOME/evolution"; From 5212f649363df1bf3a91e814e9b0bb33c8948365 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:49:43 +0100 Subject: [PATCH 07/29] bolt: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/bo/bolt/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/bolt/package.nix b/pkgs/by-name/bo/bolt/package.nix index ed2ac1fb71b9..c13efed9e5bb 100644 --- a/pkgs/by-name/bo/bolt/package.nix +++ b/pkgs/by-name/bo/bolt/package.nix @@ -90,8 +90,10 @@ stdenv.mkDerivation rec { doInstallCheck = true; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + env = { + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + }; meta = { description = "Thunderbolt 3 device management daemon"; From 7101a0557f4468321b3322805bfcf5e39abda013 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:49:51 +0100 Subject: [PATCH 08/29] casync: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/ca/casync/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/casync/package.nix b/pkgs/by-name/ca/casync/package.nix index 21c62cc44db6..9a1c009ab9b3 100644 --- a/pkgs/by-name/ca/casync/package.nix +++ b/pkgs/by-name/ca/casync/package.nix @@ -64,7 +64,8 @@ stdenv.mkDerivation { patchShebangs test/http-server.py ''; - PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; + env.PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; + mesonFlags = lib.optionals (!fuseSupport) [ "-Dfuse=false" ] ++ lib.optionals (!udevSupport) [ "-Dudev=false" ] From 096281604a8a0677c90911519e35a025f4ec9d86 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:50:02 +0100 Subject: [PATCH 09/29] dbus-broker: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/db/dbus-broker/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/db/dbus-broker/package.nix b/pkgs/by-name/db/dbus-broker/package.nix index 2bd074dd7c17..88e40e8d455c 100644 --- a/pkgs/by-name/db/dbus-broker/package.nix +++ b/pkgs/by-name/db/dbus-broker/package.nix @@ -155,9 +155,11 @@ stdenv.mkDerivation (finalAttrs: { "-D=system-console-users=gdm,sddm,lightdm" ]; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; - PKG_CONFIG_SYSTEMD_CATALOGDIR = "${placeholder "out"}/lib/systemd/catalog"; + env = { + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + PKG_CONFIG_SYSTEMD_CATALOGDIR = "${placeholder "out"}/lib/systemd/catalog"; + }; postInstall = '' install -Dm444 $src/README.md $out/share/doc/dbus-broker/README From 65d518caa3107b8861e5530bf86c94258a774423 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:50:15 +0100 Subject: [PATCH 10/29] eos-installer: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/eo/eos-installer/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/eo/eos-installer/package.nix b/pkgs/by-name/eo/eos-installer/package.nix index 2190424793c4..548611c96f3a 100644 --- a/pkgs/by-name/eo/eos-installer/package.nix +++ b/pkgs/by-name/eo/eos-installer/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''}" ]; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; doCheck = true; From 998784301de78e9e504435e58602bbdcaa516aab Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:50:23 +0100 Subject: [PATCH 11/29] espeakup: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/es/espeakup/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/es/espeakup/package.nix b/pkgs/by-name/es/espeakup/package.nix index 7701a3475ee1..3fe87c511371 100644 --- a/pkgs/by-name/es/espeakup/package.nix +++ b/pkgs/by-name/es/espeakup/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { systemd ]; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; meta = { homepage = "https://github.com/linux-speakup/espeakup"; From 965d9c2a4cec31988f4ea49a8b2792747cd0ccab Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:50:32 +0100 Subject: [PATCH 12/29] fluent-bit: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/fl/fluent-bit/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index b9fedb2941ef..1d82256959d9 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { # We fix this by setting the systemd package's `systemdsystemunitdir` pkg-config variable. # # https://man.openbsd.org/pkg-config.1#PKG_CONFIG_$PACKAGE_$VARIABLE - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; outputs = [ "out" From 9a39b91987d9047e8216b90718575a40fc1f1dd8 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:50:38 +0100 Subject: [PATCH 13/29] fnott: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/fn/fnott/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fn/fnott/package.nix b/pkgs/by-name/fn/fnott/package.nix index ca8176bbc6c9..ff0a1cd1259d 100644 --- a/pkgs/by-name/fn/fnott/package.nix +++ b/pkgs/by-name/fn/fnott/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-II8fij64ufwXg71VoSayVpSFim9+2w3j4gdTRDBrYQE="; }; - PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services"; + env.PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services"; strictDeps = true; depsBuildBuild = [ From c6adadc97e1a64d6ac58fa354333c6ab94d90cc6 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:51:08 +0100 Subject: [PATCH 14/29] gnome-applets: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/gn/gnome-applets/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gn/gnome-applets/package.nix b/pkgs/by-name/gn/gnome-applets/package.nix index 671e7c710efa..07942d9a6ef8 100644 --- a/pkgs/by-name/gn/gnome-applets/package.nix +++ b/pkgs/by-name/gn/gnome-applets/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; # Don't try to install modules to gnome panel's directory, as it's read only - PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; + env.PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; passthru = { updateScript = gnome.updateScript { From f0868b799775c4799440300a7a5d5b26d379130b Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:51:23 +0100 Subject: [PATCH 15/29] gnome-flashback: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/gn/gnome-flashback/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix index d97affeab9ac..ee21354c1abe 100644 --- a/pkgs/by-name/gn/gnome-flashback/package.nix +++ b/pkgs/by-name/gn/gnome-flashback/package.nix @@ -98,8 +98,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - PKG_CONFIG_LIBGNOME_PANEL_LAYOUTSDIR = "${placeholder "out"}/share/gnome-panel/layouts"; - PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; + env = { + PKG_CONFIG_LIBGNOME_PANEL_LAYOUTSDIR = "${placeholder "out"}/share/gnome-panel/layouts"; + PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; + }; passthru = { updateScript = gnome.updateScript { From b51a10bad68dc0980b25651d964c97c3d235ffeb Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:51:38 +0100 Subject: [PATCH 16/29] logiops: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/lo/logiops/package.nix | 2 +- pkgs/by-name/lo/logiops_0_2_3/package.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/logiops/package.nix b/pkgs/by-name/lo/logiops/package.nix index e2e136bb170c..369cd824a4d3 100644 --- a/pkgs/by-name/lo/logiops/package.nix +++ b/pkgs/by-name/lo/logiops/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (oldAttrs: { "-DDBUS_SYSTEM_POLICY_INSTALL_DIR=${placeholder "out"}/share/dbus-1/system.d" ]; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; meta = { description = "Unofficial userspace driver for HID++ Logitech devices"; diff --git a/pkgs/by-name/lo/logiops_0_2_3/package.nix b/pkgs/by-name/lo/logiops_0_2_3/package.nix index 7c08fb49023c..c7228d4f9912 100644 --- a/pkgs/by-name/lo/logiops_0_2_3/package.nix +++ b/pkgs/by-name/lo/logiops_0_2_3/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hash = "sha256-1v728hbIM2ODtB+r6SYzItczRJCsbuTvhYD2OUM1+/E="; }; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; nativeBuildInputs = [ cmake From 7a2477ac929e7b796179db2d3129649b77c1baf2 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:51:50 +0100 Subject: [PATCH 17/29] magpie: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/ma/magpie/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix index 185fc183ce1c..a63fd4dfff81 100644 --- a/pkgs/by-name/ma/magpie/package.nix +++ b/pkgs/by-name/ma/magpie/package.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # Install udev files into our own tree. - PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + env.PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; separateDebugInfo = true; From a0e1239489461b16a50d6cb6455b51e698eaafdd Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:52:08 +0100 Subject: [PATCH 18/29] mutter: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/mu/mutter/package.nix | 2 +- pkgs/by-name/mu/mutter46/package.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 4653bb2c718d..7e4936322523 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # Install udev files into our own tree. - PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + env.PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; separateDebugInfo = true; strictDeps = true; diff --git a/pkgs/by-name/mu/mutter46/package.nix b/pkgs/by-name/mu/mutter46/package.nix index f215ef9fd523..c2045eeb3060 100644 --- a/pkgs/by-name/mu/mutter46/package.nix +++ b/pkgs/by-name/mu/mutter46/package.nix @@ -184,7 +184,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # Install udev files into our own tree. - PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + env.PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; separateDebugInfo = true; From 0e9d5e426816021c0ad8c90e50523f36dc326eb6 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:52:31 +0100 Subject: [PATCH 19/29] nemo-fileroller: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/ne/nemo-fileroller/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/nemo-fileroller/package.nix b/pkgs/by-name/ne/nemo-fileroller/package.nix index 3f2abc7be5e5..39225ebed4fa 100644 --- a/pkgs/by-name/ne/nemo-fileroller/package.nix +++ b/pkgs/by-name/ne/nemo-fileroller/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { --replace "GNOMELOCALEDIR" "${cinnamon-translations}/share/locale" ''; - PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; + env.PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; meta = { homepage = "https://github.com/linuxmint/nemo-extensions/tree/master/nemo-fileroller"; From 717ad373feabaa368802699c2d8118825aed486a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:52:39 +0100 Subject: [PATCH 20/29] nemo-python: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/ne/nemo-python/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/nemo-python/package.nix b/pkgs/by-name/ne/nemo-python/package.nix index 4a962984b427..60c5aeb60d67 100644 --- a/pkgs/by-name/ne/nemo-python/package.nix +++ b/pkgs/by-name/ne/nemo-python/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { --replace "get_option('prefix'), get_option('libdir')" "'${python3}/lib'" ''; - PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; + env.PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; passthru.nemoPythonExtensionDeps = [ python3.pkgs.pygobject3 ]; From 1145b2c386f0e71d9d46dd90b19e906369035fbf Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:53:04 +0100 Subject: [PATCH 21/29] networkmanager-strongswan: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/ne/networkmanager-strongswan/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/networkmanager-strongswan/package.nix b/pkgs/by-name/ne/networkmanager-strongswan/package.nix index 1f0b5327f07b..71f80f142314 100644 --- a/pkgs/by-name/ne/networkmanager-strongswan/package.nix +++ b/pkgs/by-name/ne/networkmanager-strongswan/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { "--with-gtk4" ]; - PKG_CONFIG_LIBNM_VPNSERVICEDIR = "${placeholder "out"}/lib/NetworkManager/VPN"; + env.PKG_CONFIG_LIBNM_VPNSERVICEDIR = "${placeholder "out"}/lib/NetworkManager/VPN"; passthru = { networkManagerPlugin = "VPN/nm-strongswan-service.name"; From f5c96ef0475a543ed94f3912180eb06ddf295faa Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:53:12 +0100 Subject: [PATCH 22/29] touchegg: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/to/touchegg/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/to/touchegg/package.nix b/pkgs/by-name/to/touchegg/package.nix index b4326dfb0f1c..6c1a139026e9 100644 --- a/pkgs/by-name/to/touchegg/package.nix +++ b/pkgs/by-name/to/touchegg/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb ]); - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; passthru = { updateScript = nix-update-script { }; From ab4303c739ab3e8c984cc6fa3228fad0debafb07 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:53:18 +0100 Subject: [PATCH 23/29] virt-v2v: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/vi/virt-v2v/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/vi/virt-v2v/package.nix b/pkgs/by-name/vi/virt-v2v/package.nix index e20eba572589..642f5e84b83f 100644 --- a/pkgs/by-name/vi/virt-v2v/package.nix +++ b/pkgs/by-name/vi/virt-v2v/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { ln -s "${pkgsCross.mingwW64.rhsrvany}/bin/" $out/share/virt-tools ''; - PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions"; + env.PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions"; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; From 47805deb3743baa10a38eb25ef46dc585f71142c Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:53:22 +0100 Subject: [PATCH 24/29] waffle: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/by-name/wa/waffle/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wa/waffle/package.nix b/pkgs/by-name/wa/waffle/package.nix index 477b92ec59bb..0fb776f8cb27 100644 --- a/pkgs/by-name/wa/waffle/package.nix +++ b/pkgs/by-name/wa/waffle/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { wayland-scanner ]; - PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions"; + env.PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions"; postInstall = '' wrapProgram $out/bin/wflinfo \ From 63c525c243069bcec1c14880fabbab3d83a3a850 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:53:44 +0100 Subject: [PATCH 25/29] patheon.contractor: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/desktops/pantheon/services/contractor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index 28999fcb611a..72c6a1d404e7 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libgee ]; - PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services"; + env.PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services"; passthru = { updateScript = nix-update-script { }; From 7a12a554394bbac5f0bacaf0f7b55eac0243e7d1 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:53:57 +0100 Subject: [PATCH 26/29] gcr: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/development/libraries/gcr/4.nix | 2 +- pkgs/development/libraries/gcr/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gcr/4.nix b/pkgs/development/libraries/gcr/4.nix index d6503937d340..9527d9837cb0 100644 --- a/pkgs/development/libraries/gcr/4.nix +++ b/pkgs/development/libraries/gcr/4.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; # fails 21 out of 603 tests, needs dbus daemon - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; postPatch = '' patchShebangs gcr/fixtures/ diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index d059b30039f6..49f11feb1e48 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 21 out of 603 tests, needs dbus daemon - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; postPatch = '' patchShebangs gcr/fixtures/ From 18494bd2d4aca6145c24c7ce0afc876c0d335f7c Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:54:03 +0100 Subject: [PATCH 27/29] goocanvas: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/development/libraries/goocanvas/2.x.nix | 7 +++++-- pkgs/development/libraries/goocanvas/3.x.nix | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 3f2e32519cf4..ab1137530cee 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -55,8 +55,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-python" ]; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + + env = { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + }; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/goocanvas/3.x.nix b/pkgs/development/libraries/goocanvas/3.x.nix index 4844be9c4a3a..4d37b3f307da 100644 --- a/pkgs/development/libraries/goocanvas/3.x.nix +++ b/pkgs/development/libraries/goocanvas/3.x.nix @@ -54,8 +54,10 @@ stdenv.mkDerivation (finalAttrs: { glib ]; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + env = { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + }; passthru = { updateScript = gnome.updateScript { From faeae30ccc9d02c7b9f03f956eb05ab06ce0fca7 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:54:15 +0100 Subject: [PATCH 28/29] indicator-application: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/development/libraries/indicator-application/gtk3.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index 1d84dba554f9..447d01713dda 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -59,8 +59,10 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "$(out)/lib/systemd/user"; - PKG_CONFIG_INDICATOR3_0_4_INDICATORDIR = "$(out)/lib/indicators3/7/"; + env = { + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "$(out)/lib/systemd/user"; + PKG_CONFIG_INDICATOR3_0_4_INDICATORDIR = "$(out)/lib/indicators3/7/"; + }; # Upstart is not used in NixOS postFixup = '' From 20cddd896a335275fb990062fac07193343797f4 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 00:54:25 +0100 Subject: [PATCH 29/29] libhandy: move PKG_CONFIG env variables into env for structuredAttrs --- pkgs/development/libraries/libhandy/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 858932958dfd..283e598d6a17 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -82,8 +82,10 @@ stdenv.mkDerivation rec { ]; # Uses define_variable in pkg-config, but we still need it to use the glade output - PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; - PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; + env = { + PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; + PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; + }; doCheck = !stdenv.hostPlatform.isDarwin;