diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-25 13:54:09 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-27 11:49:15 -0600 |
commit | a33ab04d1b7ab4e8df867e8e05cb5b55222d5fe5 (patch) | |
tree | d27d00f1f1aac050fc7f45207f2e04734b55fcc6 /pkgs | |
parent | c650dc8bd7b62bcbeb640657a9408f152b278f3e (diff) |
Clean up KDE Frameworks
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix | 18 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh (renamed from pkgs/development/libraries/kde-frameworks/setup-hook.sh) | 0 |
4 files changed, 24 insertions, 28 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index cb73bbddda7e8..ffb8fb04078bf 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -78,16 +78,8 @@ let baloo = callPackage ./baloo.nix {}; bluez-qt = callPackage ./bluez-qt.nix {}; breeze-icons = callPackage ./breeze-icons.nix {}; - # FIXME: this collides with the "ecm" package. - ecm = - let drv = { cmake, ecmNoHooks, pkgconfig, qtbase, qttools }: - makeSetupHook - { deps = lib.chooseDevOutputs [ cmake ecmNoHooks pkgconfig qtbase qttools ]; } - ./setup-hook.sh; - in callPackage drv {}; - ecmNoHooks = callPackage ./extra-cmake-modules { - inherit (srcs.extra-cmake-modules) src version; - }; + ecm = callPackage ./extra-cmake-modules {}; + ecmNoHooks = callPackage ./extra-cmake-modules/no-hooks.nix {}; frameworkintegration = callPackage ./frameworkintegration.nix {}; kactivities = callPackage ./kactivities.nix {}; kactivities-stats = callPackage ./kactivities-stats.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index d2f1688e330ba..6c0919a23619f 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -1,20 +1,6 @@ -{ stdenv, lib, copyPathsToStore, src, version, cmake }: +{ makeSetupHook, lib, cmake, ecmNoHooks, pkgconfig, qtbase, qttools }: -stdenv.mkDerivation { - name = "extra-cmake-modules-${version}"; - - inherit src; - - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - - outputs = [ "out" ]; # this package has no runtime components - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - license = licenses.bsd2; - maintainers = [ maintainers.ttuegel ]; - }; +makeSetupHook { + deps = lib.chooseDevOutputs [ cmake ecmNoHooks pkgconfig qtbase qttools ]; } +./setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix new file mode 100644 index 0000000000000..855d6bdb3d257 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix @@ -0,0 +1,18 @@ +{ kdeFramework, lib, copyPathsToStore, cmake }: + +kdeFramework { + name = "extra-cmake-modules"; + + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + + outputs = [ "out" ]; # this package has no runtime components + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + license = licenses.bsd2; + maintainers = [ maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index a1638ca541be5..a1638ca541be5 100644 --- a/pkgs/development/libraries/kde-frameworks/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh |