public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libkscreen: fix circular references

Browse Source
This commit is contained in:
Thomas Tuegel 2017-05-26 16:22:27 -05:00
parent 91b99ec929
commit 7c850a0fd6
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/plasma-5/default.nix
View File

@ -71,6 +71,8 @@ let
propagateBin = propagate "bin"; propagateBin = propagate "bin";
callPackage = self.newScope { callPackage = self.newScope {
inherit propagate propagateBin;
mkDerivation = args: mkDerivation = args:
let let
inherit (args) name; inherit (args) name;

3
pkgs/desktops/plasma-5/libkscreen/default.nix
View File

@ -1,5 +1,5 @@
{ {
mkDerivation, lib, copyPathsToStore, mkDerivation, lib, copyPathsToStore, propagate,
extra-cmake-modules, extra-cmake-modules,
kwayland, libXrandr, qtx11extras kwayland, libXrandr, qtx11extras
}: }:
@ -13,4 +13,5 @@ mkDerivation {
preConfigure = '' preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\"" NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\""
''; '';
setupHook = propagate "out";
} }