diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-10-02 13:23:01 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-10-02 13:33:36 +0200 |
| commit | 46cf3b84b1f09e29e5d9ef7f2e5f2c7c72758ffb (patch) | |
| tree | 99f06a46ddce28e5e8b300defad1074874a07b39 /pkgs/tools/graphics/netpbm | |
| parent | 43ea7e011d0866a54f8bf23928ed47c0defac335 (diff) | |
netpbm: 10.91.3 → 10.92.0
Diffstat (limited to 'pkgs/tools/graphics/netpbm')
| -rw-r--r-- | pkgs/tools/graphics/netpbm/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 2f9188b483e60..948b590249fd1 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced - name = "netpbm-10.91.3"; + name = "netpbm-10.92.0"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "3940"; - sha256 = "DLpby9vZ1fZd1Cb5GbNcfKWkWh27jwoog5W+p2FM7IM="; + rev = "3972"; + sha256 = "09fpy4n4f867j23pr3b719wpvp8hjrr4drxp0r1csw74p8j6vfy3"; }; nativeBuildInputs = [ @@ -57,10 +57,6 @@ stdenv.mkDerivation { # Install libnetpbm.so symlink to correct destination substituteInPlace lib/Makefile \ --replace '/sharedlink' '/lib' - - # TODO: move to config.mk in 10.91.4 - substituteInPlace GNUmakefile \ - --replace 'pkg-config' '${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config' ''; configurePhase = '' @@ -76,6 +72,7 @@ stdenv.mkDerivation { echo 'CC = ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc' >> config.mk echo 'CC_FOR_BUILD = ${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc' >> config.mk echo 'LD_FOR_BUILD = $(CC_FOR_BUILD)' >> config.mk + echo 'PKG_CONFIG = ${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config' >> config.mk echo 'RANLIB = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk # Use libraries from Nixpkgs |