diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-10-22 21:04:04 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-01 10:04:30 +0100 |
| commit | 6b76a2d0043cb9ce7024d957e79394873dd86226 (patch) | |
| tree | 825b5d08be41efbe9a1c564839db6ae4562f4858 /pkgs/misc/ghostscript | |
| parent | 2029ca3791cd2fcd293d4b05620b3559eba4c785 (diff) | |
ghostscript: clean up
* Do not use pkgconfig alias.
* Move version & hash inline.
Diffstat (limited to 'pkgs/misc/ghostscript')
| -rw-r--r-- | pkgs/misc/ghostscript/default.nix | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 573b7a80346f..5a7762640f73 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf +{ config, stdenv, lib, fetchurl, pkg-config, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec , libiconv, ijs, lcms2, fetchpatch , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null @@ -9,11 +9,6 @@ assert x11Support -> xlibsWrapper != null; assert cupsSupport -> cups != null; let - version = "9.${ver_min}.${ver_patch}"; - ver_min = "53"; - ver_patch = "3"; - sha512 = "2vif3vgxa5wma16yxvhhkymk4p309y5204yykarq94r5rk890556d2lj5w7acnaa2ymkym6y0zd4vq9sy9ca2346igg2c6dxqkjr0zb"; - fonts = stdenv.mkDerivation { name = "ghostscript-fonts"; @@ -38,11 +33,11 @@ let in stdenv.mkDerivation rec { pname = "ghostscript"; - inherit version; + version = "9.53.3"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}${ver_patch}/${pname}-${version}.tar.xz"; - inherit sha512; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${lib.versions.minor version}${lib.versions.patch version}/${pname}-${version}.tar.xz"; + sha512 = "2vif3vgxa5wma16yxvhhkymk4p309y5204yykarq94r5rk890556d2lj5w7acnaa2ymkym6y0zd4vq9sy9ca2346igg2c6dxqkjr0zb"; }; patches = [ @@ -58,7 +53,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ zlib expat openssl libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec @@ -112,8 +107,6 @@ stdenv.mkDerivation rec { install_name_tool -change libgs.dylib.${version} $out/lib/libgs.dylib.${version} $out/bin/gs ''; - passthru = { inherit version; }; - meta = { homepage = "https://www.ghostscript.com/"; description = "PostScript interpreter (mainline version)"; |