diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-04-23 09:27:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-23 09:27:55 -0400 |
| commit | 638936f65785aaebfb96990604b984d0eb0bfedd (patch) | |
| tree | 8fb8b2e6b80cd011da0325510b20389fcced8227 /pkgs/development/libraries | |
| parent | 112a3b08e9bcffa58e0f79af0072fc8273933b87 (diff) | |
| parent | a157fc89a052bc672d1441d429f497faa58782b4 (diff) | |
Merge pull request #120124 from veprbl/pr/freeimage_fix
freeimage: fix for darwin
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/freeimage/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 5714131416d6b..b50783e2719ed 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -29,6 +29,10 @@ stdenv.mkDerivation { preInstall = '' mkdir -p $INCDIR $INSTALLDIR + '' + # Workaround for Makefiles.osx not using ?= + + lib.optionalString stdenv.isDarwin '' + makeFlagsArray+=( "INCDIR=$INCDIR" "INSTALLDIR=$INSTALLDIR" ) ''; postInstall = lib.optionalString (!stdenv.isDarwin) '' |