nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 03:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

libtiff: don't depend on OpenGL on darwin

Browse Source 
libGL is bloating the closure by depending on mesa.

0a678b4500 ('libtiff: Disable OpenGL entirely for Darwin')
b02908c213 ('libtiff: Reenable OpenGL support on Darwin')
This commit is contained in:
Dmitry Kalinkin 2021-12-31 15:22:59 -05:00
parent 4874bfd0a6
commit 2f8438a174
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/libtiff/default.nix
View File

@ -8,11 +8,6 @@
, libjpeg , libjpeg
, xz , xz
, zlib , zlib
, Cocoa
, GLUT
, libGL
, libGLU
}: }:
#FIXME: fix aarch64-darwin build and get rid of ./aarch64-darwin.nix #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) propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection)
buildInputs = [ libdeflate ] # TODO: move all propagatedBuildInputs to buildInputs. buildInputs = [ libdeflate ];
++ lib.optionals (stdenv.isDarwin) [ Cocoa GLUT libGL libGLU ];
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -18454,9 +18454,7 @@ with pkgs;
libtiff = if stdenv.isDarwin && stdenv.isAarch64 libtiff = if stdenv.isDarwin && stdenv.isAarch64
then callPackage ../development/libraries/libtiff/aarch64-darwin.nix { } then callPackage ../development/libraries/libtiff/aarch64-darwin.nix { }
else callPackage ../development/libraries/libtiff { else callPackage ../development/libraries/libtiff { };
inherit (darwin.apple_sdk.frameworks) Cocoa GLUT;
};
libtiger = callPackage ../development/libraries/libtiger { }; libtiger = callPackage ../development/libraries/libtiger { };