From 2f8438a174078840ccb8584225734480bd0f9b1e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 31 Dec 2021 15:22:59 -0500 Subject: [PATCH] libtiff: don't depend on OpenGL on darwin libGL is bloating the closure by depending on mesa. 0a678b450040f6cd9ca7cea2800a5a247d4d3c99 ('libtiff: Disable OpenGL entirely for Darwin') b02908c2133057cc88b4465285ce2c306952526d ('libtiff: Reenable OpenGL support on Darwin') --- pkgs/development/libraries/libtiff/default.nix | 8 +------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 2fe6159556f6..5f34a80d253a 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -8,11 +8,6 @@ , libjpeg , xz , zlib - -, Cocoa -, GLUT -, libGL -, libGLU }: #FIXME: fix aarch64-darwin build and get rid of ./aarch64-darwin.nix @@ -52,8 +47,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection) - buildInputs = [ libdeflate ] # TODO: move all propagatedBuildInputs to buildInputs. - ++ lib.optionals (stdenv.isDarwin) [ Cocoa GLUT libGL libGLU ]; + buildInputs = [ libdeflate ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df2cfac8b717..269e079d44f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18454,9 +18454,7 @@ with pkgs; libtiff = if stdenv.isDarwin && stdenv.isAarch64 then callPackage ../development/libraries/libtiff/aarch64-darwin.nix { } - else callPackage ../development/libraries/libtiff { - inherit (darwin.apple_sdk.frameworks) Cocoa GLUT; - }; + else callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { };