From 027c952090e5fda9badeff944b6b81ca25168f6e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 30 Dec 2020 10:46:35 +0100 Subject: Revert "libjpeg_turbo: apply cmake patch for darwin" cmake is now on 3.19.2 solving the bug that required this patch. This reverts commit 5524c43f2c0cc246de33d6eff378dcad843b2617. --- pkgs/top-level/all-packages.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29320170bcb..c92c54c21fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14509,18 +14509,7 @@ in libjpeg_original = callPackage ../development/libraries/libjpeg { }; # also known as libturbojpeg - 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_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg = libjpeg_turbo; libjreen = callPackage ../development/libraries/libjreen { }; -- cgit 1.4.1