netpbm: clean up
reorder attributes and use pkg-config instead of the alias
This commit is contained in:
parent
328e886df0
commit
f6c94e7072
@ -1,7 +1,7 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchsvn
|
, fetchsvn
|
||||||
, pkgconfig
|
, pkg-config
|
||||||
, libjpeg
|
, libjpeg
|
||||||
, libpng
|
, libpng
|
||||||
, flex
|
, flex
|
||||||
@ -27,14 +27,8 @@ stdenv.mkDerivation {
|
|||||||
sha256 = "1m7ks6k53gsjsdazgf22g16dfgj3pqvqy9mhxzlwszv5808sj5w5";
|
sha256 = "1m7ks6k53gsjsdazgf22g16dfgj3pqvqy9mhxzlwszv5808sj5w5";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
# Install libnetpbm.so symlink to correct destination
|
|
||||||
substituteInPlace lib/Makefile \
|
|
||||||
--replace '/sharedlink' '/lib'
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkgconfig
|
pkg-config
|
||||||
flex
|
flex
|
||||||
makeWrapper
|
makeWrapper
|
||||||
];
|
];
|
||||||
@ -48,6 +42,14 @@ stdenv.mkDerivation {
|
|||||||
libtiff
|
libtiff
|
||||||
] ++ lib.optional enableX11 libX11;
|
] ++ lib.optional enableX11 libX11;
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
# Install libnetpbm.so symlink to correct destination
|
||||||
|
substituteInPlace lib/Makefile \
|
||||||
|
--replace '/sharedlink' '/lib'
|
||||||
|
'';
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
runHook preConfigure
|
runHook preConfigure
|
||||||
|
|
||||||
@ -72,8 +74,6 @@ stdenv.mkDerivation {
|
|||||||
runHook postConfigure
|
runHook postConfigure
|
||||||
'';
|
'';
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user