diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-09-03 22:26:30 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-09-03 22:26:30 +0200 |
commit | f6c94e70729f3addef65ed2a0853f2f15973351f (patch) | |
tree | 3f7d0c1efe931f7b4913f127dd84a9fcd3aae8e1 /pkgs/tools/graphics/netpbm | |
parent | 328e886df05f3f1ca9609df1b7bc93b59ea13178 (diff) |
netpbm: clean up
reorder attributes and use pkg-config instead of the alias
Diffstat (limited to 'pkgs/tools/graphics/netpbm')
-rw-r--r-- | pkgs/tools/graphics/netpbm/default.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index bfb50c45f40ba..4507c4fed853e 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -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 |