From 14da7be1b957c71007ed8f520c3fe2d8b85d2d9d Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Sat, 14 Jan 2017 10:51:53 -0800 Subject: [PATCH] haskellPackages.GLUT: remove freeglut on darwin --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8395898b2d9..701410d57e9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1042,7 +1042,10 @@ self: super: { # Note: Simply patching the dynamic library (.so) of the GLUT build will *not* work, since the # RPATH also needs to be propagated when using static linking. GHC automatically handles this for # us when we patch the cabal file (Link options will be recored in the ghc package registry). - GLUT = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut; + # + # Additional note: nixpkgs' freeglut and macOS's OpenGL implementation do not cooperate, + # so disable this on Darwin only + ${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut; # https://github.com/Philonous/hs-stun/pull/1 # Remove if a version > 0.1.0.1 ever gets released.