nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

netpbm: 10.91.3 → 10.92.0

Browse Source
This commit is contained in:
Jan Tojnar 2020-10-02 13:23:01 +02:00
parent 43ea7e011d
commit 46cf3b84b1
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/graphics/netpbm/default.nix
View File

@ -19,14 +19,14 @@
stdenv.mkDerivation { stdenv.mkDerivation {
# Determine version and revision from: # Determine version and revision from:
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
name = "netpbm-10.91.3"; name = "netpbm-10.92.0";
outputs = [ "bin" "out" "dev" ]; outputs = [ "bin" "out" "dev" ];
src = fetchsvn { src = fetchsvn {
url = "https://svn.code.sf.net/p/netpbm/code/advanced"; url = "https://svn.code.sf.net/p/netpbm/code/advanced";
rev = "3940"; rev = "3972";
sha256 = "DLpby9vZ1fZd1Cb5GbNcfKWkWh27jwoog5W+p2FM7IM="; sha256 = "09fpy4n4f867j23pr3b719wpvp8hjrr4drxp0r1csw74p8j6vfy3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -57,10 +57,6 @@ stdenv.mkDerivation {
# Install libnetpbm.so symlink to correct destination # Install libnetpbm.so symlink to correct destination
substituteInPlace lib/Makefile \ substituteInPlace lib/Makefile \
--replace '/sharedlink' '/lib' --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 = '' configurePhase = ''
@ -76,6 +72,7 @@ stdenv.mkDerivation {
echo 'CC = ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc' >> config.mk 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 'CC_FOR_BUILD = ${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc' >> config.mk
echo 'LD_FOR_BUILD = $(CC_FOR_BUILD)' >> 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 echo 'RANLIB = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk
# Use libraries from Nixpkgs # Use libraries from Nixpkgs