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

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/libpng15/; revision=31568
This commit is contained in:
Yury G. Kudryashov
2012-01-14 21:40:24 +00:00
parent 2b50deaafc 5fe8b64cea
commit 13c81f6c79
81 changed files with 938 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/misc/ghostscript/default.nix
View File

@@ -85,15 +85,15 @@ stdenv.mkDerivation rec {
makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups)
'';
configureFlags = if x11Support then [ "--with-x" ] else [ "--without-x" ];
configureFlags =
(if x11Support then [ "--with-x" ] else [ "--without-x" ]) ++
(if cupsSupport then [ "--enable-cups" "--with-install-cups" ] else [ "--disable-cups" ]);
doCheck = true;
preBuild = "make so";
installTargets="install soinstall";
postInstall = ''
make soinstall
for i in $fonts; do
(cd $out/share/ghostscript && tar xvfz $i)
done