diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-14 21:34:37 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-14 21:34:37 +0000 |
| commit | 0c79434ccbaf82ab89290fffaf4bb4d444d2f874 (patch) | |
| tree | 92457d7f731a9182f812d149a3bbc9646d53f1a8 /pkgs/misc | |
| parent | 9ee0a9df9bc69e72278b8d34093238428fa3ea82 (diff) | |
| parent | 5fe8b64ceadac39a9badbd4afe6120d7157456c8 (diff) | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/ghostscript/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index c29f7c4456f87..af82a45c0fab6 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -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 |