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

Fixed rhpl which also fixes printer support in kdeadmin

Browse Source 
svn path=/nixpkgs/trunk/; revision=20031
This commit is contained in:
Sander van der Burg 2010-02-15 21:53:31 +00:00
parent 822d59d4f9
commit 61980ddf12
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/kde-4.4/admin/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, cmake, qt4, pkgconfig, perl, python { stdenv, fetchurl, lib, cmake, qt4, pkgconfig, perl, python
, sip, pyqt4, pycups, system_config_printer , sip, pyqt4, pycups, rhpl, system_config_printer
, kdelibs, kdepimlibs, kdebindings, automoc4, phonon}: , kdelibs, kdepimlibs, kdebindings, automoc4, phonon}:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -14,9 +14,9 @@ stdenv.mkDerivation {
inherit system_config_printer; inherit system_config_printer;
PYTHONPATH = "${pycups}/lib/python2.6/site-packages";
buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer
buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer
kdelibs kdepimlibs kdebindings automoc4 phonon ]; kdelibs kdepimlibs kdebindings automoc4 phonon ];
meta = { meta = {

2
pkgs/desktops/kde-4.4/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; inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer;
inherit kdelibs kdepimlibs kdebindings; inherit kdelibs kdepimlibs kdebindings;
inherit automoc4 phonon; inherit automoc4 phonon;
}; };

4
pkgs/development/python-modules/rhpl/builder.sh
View File

@ -4,8 +4,8 @@ rpm2cpio $src | cpio -idv
tar xfvj rhpl-*.tar.bz2 tar xfvj rhpl-*.tar.bz2
rm rhpl-*.tar.bz2 rm rhpl-*.tar.bz2
cd rhpl-* cd rhpl-*
sed -i -e "s@/usr/include/\$(PYTHON)@$python/include/python2.5@" \ sed -i -e "s@/usr/include/\$(PYTHON)@$python/include/python2.6@" \
-e "s@PYTHONLIBDIR = /usr/\$(LIBDIR)/\$(PYTHON)/site-packages@PYTHONLIBDIR = $out/lib/python2.5/site-packages@" Makefile.inc -e "s@PYTHONLIBDIR = /usr/\$(LIBDIR)/\$(PYTHON)/site-packages@PYTHONLIBDIR = $out/lib/python2.6/site-packages@" Makefile.inc
sed -i -e "s@/usr/bin/install@install@g" \ sed -i -e "s@/usr/bin/install@install@g" \
-e "s@\$(DESTDIR)/usr/share/locale@$out/share/locale@" po/Makefile -e "s@\$(DESTDIR)/usr/share/locale@$out/share/locale@" po/Makefile
make PREFIX=$out make PREFIX=$out