public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "libjpeg_turbo: apply cmake patch for darwin"

Browse Source 
cmake is now on 3.19.2 solving the bug that required this patch.

This reverts commit 5524c43f2c0cc246de33d6eff378dcad843b2617.
This commit is contained in:
Frederik Rietdijk 2020-12-30 10:46:35 +01:00 committed by Frederik Rietdijk
parent 056304189c
commit 027c952090
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/top-level/all-packages.nix
View File

@ -14509,18 +14509,7 @@ in
libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_original = callPackage ../development/libraries/libjpeg { };
# also known as libturbojpeg # also known as libturbojpeg
libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo (lib.optionalAttrs stdenv.isDarwin { libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
# 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; libjpeg = libjpeg_turbo;
libjreen = callPackage ../development/libraries/libjreen { }; libjreen = callPackage ../development/libraries/libjreen { };