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

Added rhpl as buildInput to kdeutils so that system-config-printer can be used 

svn path=/nixpkgs/trunk/; revision=20032
This commit is contained in:
Sander van der Burg 2010-02-15 22:20:05 +00:00
parent 61980ddf12
commit 45a92833bd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/kde-4.4/default.nix
View File

@ -186,7 +186,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; inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups rhpl system_config_printer;
inherit kdelibs kdepimlibs kdebase kdebindings; inherit kdelibs kdepimlibs kdebase kdebindings;
inherit automoc4 phonon qimageblitz qca2; inherit automoc4 phonon qimageblitz qca2;
}; };

4
pkgs/desktops/kde-4.4/utils/default.nix
View File

@ -1,5 +1,5 @@
{ 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 , sip, pyqt4, pycups, rhpl, system_config_printer
, kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}: , kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -14,7 +14,7 @@ stdenv.mkDerivation {
inherit system_config_printer; inherit system_config_printer;
buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4 pycups system_config_printer buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4 pycups rhpl system_config_printer
kdelibs kdepimlibs kdebase kdebindings automoc4 phonon qimageblitz qca2 ]; kdelibs kdepimlibs kdebase kdebindings automoc4 phonon qimageblitz qca2 ];
meta = { meta = {