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

* Drop the rhpl dependency in kdeadmin and kdeutils because it doesn't

Browse Source 
build.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19779
This commit is contained in:
Eelco Dolstra 2010-02-03 12:56:57 +00:00
parent b6943f0056
commit 3687f56e7a
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/desktops/kde-4.3/admin/default.nix
View File

@ -1,19 +1,26 @@
{ stdenv, fetchurl, lib, cmake, qt4, pkgconfig, perl, python { stdenv, fetchurl, lib, cmake, qt4, pkgconfig, perl, python
, sip, pyqt4, pycups, system_config_printer, rhpl , sip, pyqt4, pycups, system_config_printer
, kdelibs, kdepimlibs, kdebindings, automoc4, phonon}: , kdelibs, kdepimlibs, kdebindings, automoc4, phonon}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kdeadmin-4.3.4"; name = "kdeadmin-4.3.4";
src = fetchurl { src = fetchurl {
url = mirror://kde/stable/4.3.4/src/kdeadmin-4.3.4.tar.bz2; url = mirror://kde/stable/4.3.4/src/kdeadmin-4.3.4.tar.bz2;
sha1 = "8f61aeb2ff9d51712d72cd77dad837c8902b6a5d"; sha1 = "8f61aeb2ff9d51712d72cd77dad837c8902b6a5d";
}; };
builder = ./builder.sh; builder = ./builder.sh;
inherit system_config_printer; inherit system_config_printer;
includeAllQtDirs=true; includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs; CMAKE_PREFIX_PATH=kdepimlibs;
buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl
buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer
kdelibs kdepimlibs kdebindings automoc4 phonon ]; kdelibs kdepimlibs kdebindings automoc4 phonon ];
meta = { meta = {
description = "KDE Administration Utilities"; description = "KDE Administration Utilities";
license = "GPL"; license = "GPL";

4
pkgs/desktops/kde-4.3/default.nix
View File

@ -102,7 +102,7 @@ pkgs.recurseIntoAttrs (rec {
}; };
kdeadmin = import ./admin { kdeadmin = import ./admin {
inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl; inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer;
inherit kdelibs kdepimlibs kdebindings; inherit kdelibs kdepimlibs kdebindings;
inherit automoc4 phonon; inherit automoc4 phonon;
}; };
@ -185,7 +185,7 @@ pkgs.recurseIntoAttrs (rec {
}; };
kdeutils = import ./utils { kdeutils = import ./utils {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups system_config_printer rhpl; inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups system_config_printer;
inherit kdelibs kdelibs_experimental kdepimlibs kdebase kdebindings; inherit kdelibs kdelibs_experimental kdepimlibs kdebase kdebindings;
inherit automoc4 phonon qimageblitz qca2; inherit automoc4 phonon qimageblitz qca2;
}; };

11
pkgs/desktops/kde-4.3/utils/default.nix
View File

@ -1,19 +1,26 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, gmp, python, libzip, libarchive, xz { stdenv, fetchurl, lib, cmake, qt4, perl, gmp, python, libzip, libarchive, xz
, sip, pyqt4, pycups, system_config_printer, rhpl , sip, pyqt4, pycups, system_config_printer
, kdelibs, kdelibs_experimental, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}: , kdelibs, kdelibs_experimental, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kdeutils-4.3.4"; name = "kdeutils-4.3.4";
src = fetchurl { src = fetchurl {
url = mirror://kde/stable/4.3.4/src/kdeutils-4.3.4.tar.bz2; url = mirror://kde/stable/4.3.4/src/kdeutils-4.3.4.tar.bz2;
sha1 = "2d5e26055e364af2df7459cdbc3aebdc3a8abdea"; sha1 = "2d5e26055e364af2df7459cdbc3aebdc3a8abdea";
}; };
builder = ./builder.sh; builder = ./builder.sh;
inherit system_config_printer; inherit system_config_printer;
includeAllQtDirs=true; includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs; CMAKE_PREFIX_PATH=kdepimlibs;
buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4 pycups system_config_printer rhpl
buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4 pycups system_config_printer
kdelibs kdelibs_experimental kdepimlibs kdebase kdebindings automoc4 phonon qimageblitz qca2 ]; kdelibs kdelibs_experimental kdepimlibs kdebase kdebindings automoc4 phonon qimageblitz qca2 ];
meta = { meta = {
description = "KDE Utilities"; description = "KDE Utilities";
license = "GPL"; license = "GPL";

4
pkgs/development/python-modules/rhpl/default.nix
View File

@ -2,11 +2,15 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "rhpl-0.218"; name = "rhpl-0.218";
src = fetchurl { src = fetchurl {
url = http://ftp.stw-bonn.de/pub/fedora/linux/releases/10/Everything/source/SRPMS/rhpl-0.218-1.src.rpm; url = http://ftp.stw-bonn.de/pub/fedora/linux/releases/10/Everything/source/SRPMS/rhpl-0.218-1.src.rpm;
md5 = "a72c6b66df782ca1d4950959d2aad292"; md5 = "a72c6b66df782ca1d4950959d2aad292";
}; };
inherit python; inherit python;
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [ rpm cpio python wirelesstools gettext ]; buildInputs = [ rpm cpio python wirelesstools gettext ];
} }