diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-07-30 09:36:52 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-07-30 09:36:52 -0500 |
commit | b390eb39ae3ac1842f90c445b8436707842a6cce (patch) | |
tree | 222733cd6a30e45ff89ad351c23f734c2bfe4ecf /pkgs/development/libraries/kde-frameworks/default.nix | |
parent | 29739ece1f1e6a7602207ff03273f6a59907f322 (diff) | |
download | nixpkgs-b390eb39ae3ac1842f90c445b8436707842a6cce.tar nixpkgs-b390eb39ae3ac1842f90c445b8436707842a6cce.tar.gz nixpkgs-b390eb39ae3ac1842f90c445b8436707842a6cce.tar.bz2 nixpkgs-b390eb39ae3ac1842f90c445b8436707842a6cce.tar.lz nixpkgs-b390eb39ae3ac1842f90c445b8436707842a6cce.tar.xz nixpkgs-b390eb39ae3ac1842f90c445b8436707842a6cce.tar.zst nixpkgs-b390eb39ae3ac1842f90c445b8436707842a6cce.zip |
kde5: fix extra-cmake-modules hooks
Diffstat (limited to 'pkgs/development/libraries/kde-frameworks/default.nix')
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index c6f8b120b8d..49ece732222 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -31,10 +31,6 @@ let ++ [ "-DBUILD_TESTING=OFF" ] ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - nativeBuildInputs = - (args.nativeBuildInputs or []) - ++ [ pkgs.cmake pkgs.pkgconfig ecm ]; - }); kdeFramework = args: @@ -59,9 +55,9 @@ let bluez-qt = callPackage ./bluez-qt.nix {}; breeze-icons = callPackage ./breeze-icons.nix {}; ecm = - let drv = { qtbase, qttools }: + let drv = { cmake, extra-cmake-modules, pkgconfig, qtbase, qttools }: makeSetupHook - { deps = [ extra-cmake-modules qtbase qttools ]; } + { deps = [ cmake extra-cmake-modules pkgconfig qtbase qttools ]; } ./setup-hook.sh; in callPackage drv {}; extra-cmake-modules = callPackage ./extra-cmake-modules { |