BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ftgl: fix on darwin

Browse source
This commit is contained in:
Dmitry Kalinkin 2019-02-01 14:16:52 -05:00
parent 453baaeabd
commit e253fd1a95
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/libraries/ftgl/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, freetype, libGLU_combined}: { stdenv, fetchurl, freetype, libGLU_combined, OpenGL }:
let let
name = "ftgl-2.1.3-rc5"; name = "ftgl-2.1.3-rc5";
@ -11,7 +11,12 @@ stdenv.mkDerivation {
sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"; sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l";
}; };
buildInputs = [ freetype libGLU_combined ]; buildInputs = [ freetype ]
++ (if stdenv.isDarwin then
[ OpenGL ]
else
[ libGLU_combined ])
;
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -2728,7 +2728,9 @@ in
frostwire = callPackage ../applications/networking/p2p/frostwire { }; frostwire = callPackage ../applications/networking/p2p/frostwire { };
frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { };
ftgl = callPackage ../development/libraries/ftgl { }; ftgl = callPackage ../development/libraries/ftgl {
inherit (darwin.apple_sdk.frameworks) OpenGL;
};
ftop = callPackage ../os-specific/linux/ftop { }; ftop = callPackage ../os-specific/linux/ftop { };