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

* Build CUPS with dbus support, plus some purity fixes.

Browse Source 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18051
This commit is contained in:
Eelco Dolstra 2009-10-30 12:33:34 +00:00
parent 78648561c5
commit 404007aab3
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/misc/cups/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, zlib, libjpeg, libpng, libtiff, pam, openssl}: { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl, dbus }:
let version = "1.4.1"; in let version = "1.4.1"; in
@ -17,17 +17,11 @@ stdenv.mkDerivation {
}) })
]; ];
buildInputs = [ zlib libjpeg libpng libtiff pam ]; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus ];
propagatedBuildInputs = [ openssl ]; propagatedBuildInputs = [ openssl ];
preConfigure = '' configureFlags = "--localstatedir=/var --enable-dbus"; # --with-dbusdir
configureFlags="--localstatedir=/var"
'';
preBuild = ''
makeFlagsArray=(INITDIR=$out/etc/rc.d)
'';
installFlags = installFlags =
[ # Don't try to write in /var at build time. [ # Don't try to write in /var at build time.
@ -35,6 +29,10 @@ stdenv.mkDerivation {
"LOGDIR=$(TMPDIR)/dummy" "LOGDIR=$(TMPDIR)/dummy"
"REQUESTS=$(TMPDIR)/dummy" "REQUESTS=$(TMPDIR)/dummy"
"STATEDIR=$(TMPDIR)/dummy" "STATEDIR=$(TMPDIR)/dummy"
# Idem for /etc.
"PAMDIR=$(out)/etc/pam.d"
"DBUSDIR=$(out)/etc/dbus-1"
"INITDIR=$(out)/etc/rc.d"
# Work around a Makefile bug. # Work around a Makefile bug.
"CUPS_PRIMARY_SYSTEM_GROUP=root" "CUPS_PRIMARY_SYSTEM_GROUP=root"
]; ];

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

@ -8474,7 +8474,7 @@ let
}; };
cups = import ../misc/cups { cups = import ../misc/cups {
inherit fetchurl stdenv zlib libjpeg libpng libtiff pam openssl; inherit fetchurl stdenv pkgconfig zlib libjpeg libpng libtiff pam openssl dbus;
}; };
gutenprint = import ../misc/drivers/gutenprint { gutenprint = import ../misc/drivers/gutenprint {