ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 22:32:58 +03:00
Code Issues Projects Releases Wiki Activity

Clean up KDE Frameworks

Browse Source
This commit is contained in:
Thomas Tuegel 2017-02-25 13:54:09 -06:00
parent c650dc8bd7
commit a33ab04d1b
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
4 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/kde-frameworks/default.nix
View File

@ -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 {};

22
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
View File

@ -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

18
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix Normal file
View File

@ -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 ];
};
}

0
pkgs/development/libraries/kde-frameworks/setup-hook.sh → pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
View File