diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-12-04 14:57:38 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-12-04 19:02:30 +0100 |
| commit | 5524c43f2c0cc246de33d6eff378dcad843b2617 (patch) | |
| tree | e4b06c31a12384efcb0f3e0ee68289f759ab8389 | |
| parent | 4b8f5caddc8d2a12eb0bed9122dcd1adb3435965 (diff) | |
libjpeg_turbo: apply cmake patch for darwin
There is a regression with 3.19.1 which, for so far we've noticed, only
affects this package and on Darwin. To avoid a mass-rebuild right now,
we patch cmake only for darwin and this package.
Fixes https://github.com/NixOS/nixpkgs/issues/105854
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e1f8d48d4ab..855cf321e01d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14323,7 +14323,18 @@ in libjpeg_original = callPackage ../development/libraries/libjpeg { }; # also known as libturbojpeg - libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; + libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo (lib.optionalAttrs stdenv.isDarwin { + # cmake 3.19.1 has a bug. So far only noticed with this package. + # https://github.com/NixOS/nixpkgs/issues/105854 + cmake = cmake.overrideAttrs(oldAttrs: { + patches = oldAttrs.patches ++ [ + (fetchpatch { + url = "https://gitlab.kitware.com/cmake/cmake/-/commit/fcabf4a47e0c441ff80fad8f34e388b16738bd33.patch"; + sha256 = "bVrjY8omtAEKe8G76hGtmO54LKJvhx3RTW6OF6Y7rsU="; + }) + ]; + }); + }); libjpeg = libjpeg_turbo; libjreen = callPackage ../development/libraries/libjreen { }; |