diff options
| author | Jude Taylor <me@jude.bio> | 2017-01-14 10:51:53 -0800 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2017-01-14 10:52:18 -0800 |
| commit | 14da7be1b957c71007ed8f520c3fe2d8b85d2d9d (patch) | |
| tree | c1620b634b8d4cd97bf17f9b9913ce8cbed419e0 /pkgs/development/haskell-modules | |
| parent | ae8ec5a44b1b18bc17475cc57fcf207dd16fd2a7 (diff) | |
| download | nixlib-14da7be1b957c71007ed8f520c3fe2d8b85d2d9d.tar nixlib-14da7be1b957c71007ed8f520c3fe2d8b85d2d9d.tar.gz nixlib-14da7be1b957c71007ed8f520c3fe2d8b85d2d9d.tar.bz2 nixlib-14da7be1b957c71007ed8f520c3fe2d8b85d2d9d.tar.lz nixlib-14da7be1b957c71007ed8f520c3fe2d8b85d2d9d.tar.xz nixlib-14da7be1b957c71007ed8f520c3fe2d8b85d2d9d.tar.zst nixlib-14da7be1b957c71007ed8f520c3fe2d8b85d2d9d.zip | |
haskellPackages.GLUT: remove freeglut on darwin
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8395898b2d98..701410d57e9b 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. |