mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Let kdePackage use manifest.nix
svn path=/nixpkgs/trunk/; revision=23120
This commit is contained in:
parent
670135ecb6
commit
de3531c2d5
7 changed files with 7 additions and 9 deletions
|
@ -4,7 +4,6 @@
|
|||
kdePackage {
|
||||
pn = "kdebase";
|
||||
v = "4.5.0";
|
||||
sha256 = "1znmmx84hx3a31lhr55j3h91p9r6fv1c4q9hbgv4xwaijlkxk6dw";
|
||||
|
||||
preConfigure = "cd apps";
|
||||
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
kdePackage rec {
|
||||
pn = "kdebindings";
|
||||
v = "4.5.0";
|
||||
sha256 = "0x8c98gbp2rm3dckzw3l0jh2ch5g9sb2prmilwzl8d5psyhx39n6";
|
||||
|
||||
patches = [ ./python-site-packages-install-dir.diff ];
|
||||
|
||||
|
|
|
@ -1,12 +1,16 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
a@{ pn, v, stable ? true, sha256, subdir ? null, ... }:
|
||||
let
|
||||
manifest = import ./manifest.nix;
|
||||
in
|
||||
|
||||
a@{ pn, v, stable ? true, subdir ? null, ... }:
|
||||
stdenv.mkDerivation ({
|
||||
name = "${pn}-${v}";
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/" + (if stable then "" else "un") + "stable/" +
|
||||
(if subdir == null then "${v}/src" else subdir) + "/${pn}-${v}.tar.bz2";
|
||||
inherit sha256;
|
||||
sha256 = builtins.getAttr "${pn}-${v}.tar.bz2" manifest;
|
||||
};
|
||||
meta = {
|
||||
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
|
||||
|
@ -14,4 +18,4 @@ stdenv.mkDerivation ({
|
|||
inherit stable;
|
||||
homepage = http://www.kde.org;
|
||||
} // ( if a ? meta then a.meta else { } );
|
||||
} // (removeAttrs a [ "meta" "pn" "v" "stable" "sha256" "subdir" ]))
|
||||
} // (removeAttrs a [ "meta" "pn" "v" "stable" "subdir" ]))
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
kdePackage {
|
||||
pn = "kdelibs";
|
||||
v = "4.5.0";
|
||||
sha256 = "0d3iml2v1vp1y6i5vpqv77nbdlw6qb8j6c88yi744ba4zvcirzrx";
|
||||
|
||||
buildInputs = [
|
||||
cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
kdePackage {
|
||||
pn = "kdepimlibs";
|
||||
v = "4.5.0";
|
||||
sha256 = "0n3wmc2c4jcxbi81i9jmw23b5ms43gia58qpr835im874641f54m";
|
||||
|
||||
buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme libical openldap
|
||||
shared_mime_info kdelibs automoc4 akonadi soprano ];
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
kdePackage {
|
||||
pn = "oxygen-icons";
|
||||
v = "4.5.0";
|
||||
sha256 = "11wlrxnral4q5wi46p1di1cff4vr5da35a8dv2xx3ag6lnhqvjqi";
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
|
|
|
@ -4,7 +4,6 @@ kdePackage {
|
|||
pn = "polkit-qt-1";
|
||||
v = "0.96.1";
|
||||
subdir = "apps/KDE4.x/admin";
|
||||
sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
|
||||
|
||||
buildInputs = [ cmake qt4 automoc4 ];
|
||||
propagatedBuildInputs = [ polkit glib ];
|
||||
|
|
Loading…
Reference in a new issue