From 6ffe4109839c62ccd7347f915f6b810768fc99f8 Mon Sep 17 00:00:00 2001 From: Kevin Mehall Date: Fri, 3 Jun 2022 13:29:23 -0700 Subject: [PATCH] freeimage: cleanup suggestions from code review Co-authored-by: Sandro --- pkgs/development/libraries/freeimage/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index c6215873128b31..807e96669c6779 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -15,8 +15,13 @@ stdenv.mkDerivation { sourceRoot = "svn-r1900/FreeImage/trunk"; # Ensure that the bundled libraries are not used at all - prePatch = "rm -rf Source/Lib* Source/OpenEXR Source/ZLib"; - patches = [ ./unbundle.diff ./libtiff-4.4.0.diff ]; + prePatch = '' + rm -rf Source/Lib* Source/OpenEXR Source/ZLib + ''; + patches = [ + ./unbundle.diff + ./libtiff-4.4.0.diff + ]; postPatch = '' # To support cross compilation, use the correct `pkg-config`.