From f6c94e70729f3addef65ed2a0853f2f15973351f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 3 Sep 2020 22:26:30 +0200 Subject: [PATCH] netpbm: clean up reorder attributes and use pkg-config instead of the alias --- pkgs/tools/graphics/netpbm/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index bfb50c45f40..4507c4fed85 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