dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fox: use mesa_glu explicitly

Browse Source 
Drop the seemingly‐unused CoreServices dependency while we’re at it.
This commit is contained in:
Emily 2024-06-21 06:59:47 +01:00
parent ee6ffaf921
commit 25f7f9a636
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/fox/default.nix
View File

@ -6,13 +6,11 @@
, libtiff , libtiff
, zlib , zlib
, bzip2 , bzip2
, libGL , mesa_glu
, libGLU
, libXcursor , libXcursor
, libXext , libXext
, libXrandr , libXrandr
, libXft , libXft
, CoreServices
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -24,8 +22,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-bu+IEqNkv9OAf96dPYre3CP759pjalVIbYyc3QSQW2w="; sha256 = "sha256-bu+IEqNkv9OAf96dPYre3CP759pjalVIbYyc3QSQW2w=";
}; };
buildInputs = [ libpng libjpeg libtiff zlib bzip2 libGL libGLU libXcursor libXext libXrandr libXft ] buildInputs = [ libpng libjpeg libtiff zlib bzip2 mesa_glu libXcursor libXext libXrandr libXft ];
++ lib.optional stdenv.isDarwin CoreServices;
doCheck = true; doCheck = true;

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

@ -8026,9 +8026,7 @@ with pkgs;
fortune = callPackage ../tools/misc/fortune { }; fortune = callPackage ../tools/misc/fortune { };
fox = callPackage ../development/libraries/fox { fox = callPackage ../development/libraries/fox {};
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;