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

kdeFrameworks: Hide internal kdeFramework deriver

This commit is contained in:
Thomas Tuegel 2017-02-25 14:22:26 -06:00
parent 68e0bc38a2
commit fca3f2e661
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
3 changed files with 107 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/kde-frameworks/build-support/framework.nix Normal file
View File

@ -0,0 +1,24 @@
{ kdeDerivation, lib, fetchurl }:
let
mirror = "mirror://kde";
srcs = import ../srcs.nix { inherit fetchurl mirror; };
in
args:
let
inherit (args) name;
inherit (srcs."${name}") src version;
in kdeDerivation (args // {
name = "${name}-${version}";
inherit src;
meta = {
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
} // (args.meta or {});
})

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

@ -24,36 +24,16 @@ existing packages here and modify it as necessary.
*/
{ newScope, kdeDerivation, lib, fetchurl }:
let
callPackage = newScope {
kdeFramework = import ./build-support/framework.nix {
inherit kdeDerivation lib fetchurl;
};
};
in
{
stdenv, lib, makeSetupHook, makeWrapper, fetchurl, buildEnv,
kdeDerivation, callPackage,
debug ? false
}:
let
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit fetchurl mirror; };
packages = rec {
kdeFramework = args:
let
inherit (args) name;
inherit (srcs."${name}") src version;
in kdeDerivation (args // {
name = "${name}-${version}";
inherit src;
meta = {
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
} // (args.meta or {});
});
attica = callPackage ./attica.nix {};
baloo = callPackage ./baloo.nix {};
bluez-qt = callPackage ./bluez-qt.nix {};
@ -127,6 +107,4 @@ let
sonnet = callPackage ./sonnet.nix {};
syntax-highlighting = callPackage ./syntax-highlighting.nix {};
threadweaver = callPackage ./threadweaver.nix {};
};
in packages
}

4
pkgs/top-level/all-packages.nix
View File

@ -9343,8 +9343,8 @@ with pkgs;
mkLibsForQt5 = self: with self;
let kdeFrameworks = import ../development/libraries/kde-frameworks {
inherit stdenv lib kdeDerivation makeSetupHook makeWrapper fetchurl buildEnv;
inherit (self) callPackage;
inherit (self) newScope;
inherit kdeDerivation lib fetchurl;
};
in {