Skip to content

Commit

Permalink
libjpeg_turbo: apply cmake patch for darwin
Browse files Browse the repository at this point in the history
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 #105854
  • Loading branch information
FRidh committed Dec 4, 2020
1 parent 4b8f5ca commit 5524c43
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -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 { };
Expand Down

0 comments on commit 5524c43

Please sign in to comment.