diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2023-02-23 12:07:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-23 12:07:47 +0000 |
| commit | 42008a14a4461ba309fbaf46145b18dd16a7e472 (patch) | |
| tree | fbb70dd1ed35b815ff69a66726289ce9f7bbaf16 /pkgs/desktops/plasma-5 | |
| parent | 984655a3c7c125eaf2fbc46d4f32bfe17f67e0e7 (diff) | |
| parent | 3251013cc149d535d857e6bca6da28a61bf81faa (diff) | |
| download | nixlib-42008a14a4461ba309fbaf46145b18dd16a7e472.tar nixlib-42008a14a4461ba309fbaf46145b18dd16a7e472.tar.gz nixlib-42008a14a4461ba309fbaf46145b18dd16a7e472.tar.bz2 nixlib-42008a14a4461ba309fbaf46145b18dd16a7e472.tar.lz nixlib-42008a14a4461ba309fbaf46145b18dd16a7e472.tar.xz nixlib-42008a14a4461ba309fbaf46145b18dd16a7e472.tar.zst nixlib-42008a14a4461ba309fbaf46145b18dd16a7e472.zip | |
Merge pull request #217206 from Artturin/stdenvimprovements1
Diffstat (limited to 'pkgs/desktops/plasma-5')
| -rw-r--r-- | pkgs/desktops/plasma-5/ksystemstats.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix index 6b04d055eac7..5b552a1f7860 100644 --- a/pkgs/desktops/plasma-5/ksystemstats.nix +++ b/pkgs/desktops/plasma-5/ksystemstats.nix @@ -9,7 +9,7 @@ mkDerivation { pname = "ksystemstats"; - NIX_CFLAGS_COMPILE = [ "-I${lib.getBin libksysguard}/share" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getBin libksysguard}/share" ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libksysguard libnl lm_sensors networkmanager-qt ]; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 252b6a9fac55..9d1fe45656e2 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -162,7 +162,7 @@ mkDerivation { ln -sf $out/bin/kcminit $out/bin/kcminit_startup ''; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' ''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"'' ''-DNIXPKGS_START_KDEINIT_WRAPPER="${getLib kinit}/libexec/kf5/start_kdeinit_wrapper"'' |