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
This commit is contained in:
parent
9b7670ce5b
commit
1981322cc5
|
@ -4,7 +4,7 @@ let version = "1.4.1"; in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "cups-${version}";
|
name = "cups-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2";
|
url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2";
|
||||||
sha256 = "1fnkq993hr8l87x6f7a7wik2spac3f7nn4wksrvwk690r8a6zxng";
|
sha256 = "1fnkq993hr8l87x6f7a7wik2spac3f7nn4wksrvwk690r8a6zxng";
|
||||||
|
@ -33,6 +33,10 @@ stdenv.mkDerivation {
|
||||||
"PAMDIR=$(out)/etc/pam.d"
|
"PAMDIR=$(out)/etc/pam.d"
|
||||||
"DBUSDIR=$(out)/etc/dbus-1"
|
"DBUSDIR=$(out)/etc/dbus-1"
|
||||||
"INITDIR=$(out)/etc/rc.d"
|
"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.
|
# Work around a Makefile bug.
|
||||||
"CUPS_PRIMARY_SYSTEM_GROUP=root"
|
"CUPS_PRIMARY_SYSTEM_GROUP=root"
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in a new issue