aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/tools/graphics/netpbm/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/graphics/netpbm/default.nix')
-rw-r--r--nixpkgs/pkgs/tools/graphics/netpbm/default.nix22
1 files changed, 11 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/tools/graphics/netpbm/default.nix b/nixpkgs/pkgs/tools/graphics/netpbm/default.nix
index b2452be7339..4507c4fed85 100644
--- a/nixpkgs/pkgs/tools/graphics/netpbm/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/netpbm/default.nix
@@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchsvn
-, pkgconfig
+, pkg-config
, libjpeg
, libpng
, flex
@@ -24,17 +24,11 @@ stdenv.mkDerivation {
src = fetchsvn {
url = "https://svn.code.sf.net/p/netpbm/code/advanced";
rev = "3735";
- sha256 = "hRepEUBlf83p77Amjze+Qz7XTHhCuPdV01K/UabR89Q=";
+ 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