From e253fd1a95a41898f8f112be9d46f6e3af233cae Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 1 Feb 2019 14:16:52 -0500 Subject: [PATCH] ftgl: fix on darwin --- pkgs/development/libraries/ftgl/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 8808af49f9e..289a5739985 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, freetype, libGLU_combined}: +{ stdenv, fetchurl, freetype, libGLU_combined, OpenGL }: let name = "ftgl-2.1.3-rc5"; @@ -11,7 +11,12 @@ stdenv.mkDerivation { sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"; }; - buildInputs = [ freetype libGLU_combined ]; + buildInputs = [ freetype ] + ++ (if stdenv.isDarwin then + [ OpenGL ] + else + [ libGLU_combined ]) + ; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c476c9c7fd4..ac3f6b64712 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2728,7 +2728,9 @@ in frostwire = callPackage ../applications/networking/p2p/frostwire { }; 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 { };