libkscreen: fix circular references

2017-05-26 16:22:27 -05:00 · 2017-05-26 16:22:27 -05:00 · 7c850a0fd6
commit 7c850a0fd6
parent 91b99ec929
2 changed files with 4 additions and 1 deletions
--- 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;
--- 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";
 }