diff options
| author | Peter Simons <simons@cryp.to> | 2009-11-05 13:33:36 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2009-11-05 13:33:36 +0000 |
| commit | 1981322cc5befc49495b82e18abd62a4e33adcf5 (patch) | |
| tree | 0285513fee75a12c467133b8e71bd1f9802cacad /pkgs/misc | |
| parent | 9b7670ce5bd1639b1c0ebf3d3909537da186893f (diff) | |
| download | nixlib-1981322cc5befc49495b82e18abd62a4e33adcf5.tar nixlib-1981322cc5befc49495b82e18abd62a4e33adcf5.tar.gz nixlib-1981322cc5befc49495b82e18abd62a4e33adcf5.tar.bz2 nixlib-1981322cc5befc49495b82e18abd62a4e33adcf5.tar.lz nixlib-1981322cc5befc49495b82e18abd62a4e33adcf5.tar.xz nixlib-1981322cc5befc49495b82e18abd62a4e33adcf5.tar.zst nixlib-1981322cc5befc49495b82e18abd62a4e33adcf5.zip | |
pkgs/misc/cups/default.nix: don't install files to /etc or /usr
The cups build tries to install files into global system directories. This patch changes those paths to locations underneath of $out. svn path=/nixpkgs/trunk/; revision=18134
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 2f164802b6ce..73d665bcc0eb 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -4,7 +4,7 @@ let version = "1.4.1"; in stdenv.mkDerivation { name = "cups-${version}"; - + src = fetchurl { url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; sha256 = "1fnkq993hr8l87x6f7a7wik2spac3f7nn4wksrvwk690r8a6zxng"; @@ -33,6 +33,10 @@ stdenv.mkDerivation { "PAMDIR=$(out)/etc/pam.d" "DBUSDIR=$(out)/etc/dbus-1" "INITDIR=$(out)/etc/rc.d" + "XINETD=$(out)/etc/xinetd.d" + # Idem for /usr. + "MENUDIR=$(out)/share/applications" + "ICONDIR=$(out)/share/icons" # Work around a Makefile bug. "CUPS_PRIMARY_SYSTEM_GROUP=root" ]; |