netpbm: clean up

reorder attributes and use pkg-config instead of the alias
This commit is contained in:
Jan Tojnar
2020-09-03 22:26:30 +02:00
parent 328e886df0
commit f6c94e7072

View File

@@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchsvn
, pkgconfig
, pkg-config
, libjpeg
, libpng
, flex
@@ -27,14 +27,8 @@ stdenv.mkDerivation {
sha256 = "1m7ks6k53gsjsdazgf22g16dfgj3pqvqy9mhxzlwszv5808sj5w5";
};
postPatch = ''
# Install libnetpbm.so symlink to correct destination
substituteInPlace lib/Makefile \
--replace '/sharedlink' '/lib'
'';
nativeBuildInputs = [
pkgconfig
pkg-config
flex
makeWrapper
];
@@ -48,6 +42,14 @@ stdenv.mkDerivation {
libtiff
] ++ lib.optional enableX11 libX11;
enableParallelBuilding = true;
postPatch = ''
# Install libnetpbm.so symlink to correct destination
substituteInPlace lib/Makefile \
--replace '/sharedlink' '/lib'
'';
configurePhase = ''
runHook preConfigure
@@ -72,8 +74,6 @@ stdenv.mkDerivation {
runHook postConfigure
'';
enableParallelBuilding = true;
installPhase = ''
runHook preInstall