diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-26 16:22:27 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-08-21 06:51:33 -0500 |
commit | 7c850a0fd6ada32eb3e24b63222caa32f9de960b (patch) | |
tree | fcf408efd0f09904ef98103e635ba3e9794b7ac4 /pkgs/desktops/plasma-5 | |
parent | 91b99ec9296536e1a6090d269564330502996ce2 (diff) | |
download | nixlib-7c850a0fd6ada32eb3e24b63222caa32f9de960b.tar nixlib-7c850a0fd6ada32eb3e24b63222caa32f9de960b.tar.gz nixlib-7c850a0fd6ada32eb3e24b63222caa32f9de960b.tar.bz2 nixlib-7c850a0fd6ada32eb3e24b63222caa32f9de960b.tar.lz nixlib-7c850a0fd6ada32eb3e24b63222caa32f9de960b.tar.xz nixlib-7c850a0fd6ada32eb3e24b63222caa32f9de960b.tar.zst nixlib-7c850a0fd6ada32eb3e24b63222caa32f9de960b.zip |
libkscreen: fix circular references
Diffstat (limited to 'pkgs/desktops/plasma-5')
-rw-r--r-- | pkgs/desktops/plasma-5/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/libkscreen/default.nix | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index e386f3a319a1..a962d3054f81 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -71,6 +71,8 @@ let propagateBin = propagate "bin"; callPackage = self.newScope { + inherit propagate propagateBin; + mkDerivation = args: let inherit (args) name; diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index b81755ed7579..5625aa656ceb 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, propagate, extra-cmake-modules, kwayland, libXrandr, qtx11extras }: @@ -13,4 +13,5 @@ mkDerivation { preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\"" ''; + setupHook = propagate "out"; } |