diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-30 12:33:34 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-30 12:33:34 +0000 |
| commit | 404007aab318b242e3d1969cfd1fe375d387eca2 (patch) | |
| tree | 0e5829ad7239c7c933f52dd81022b61cc6ea1ea3 /pkgs | |
| parent | 78648561c513e1fb18c0ce34abd01d6f2603b8e0 (diff) | |
* Build CUPS with dbus support, plus some purity fixes.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18051
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 84ef7966c4f88..2f164802b6ce1 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -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 @@ -17,24 +17,22 @@ stdenv.mkDerivation { }) ]; - buildInputs = [ zlib libjpeg libpng libtiff pam ]; + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus ]; propagatedBuildInputs = [ openssl ]; - preConfigure = '' - configureFlags="--localstatedir=/var" - ''; + configureFlags = "--localstatedir=/var --enable-dbus"; # --with-dbusdir - preBuild = '' - makeFlagsArray=(INITDIR=$out/etc/rc.d) - ''; - installFlags = [ # Don't try to write in /var at build time. "CACHEDIR=$(TMPDIR)/dummy" "LOGDIR=$(TMPDIR)/dummy" "REQUESTS=$(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. "CUPS_PRIMARY_SYSTEM_GROUP=root" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66f8551022237..4d2f174b824dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8474,7 +8474,7 @@ let }; 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 { |