Skip to content

Commit

Permalink
haskellPackages.GLUT: remove freeglut on darwin
Browse files Browse the repository at this point in the history
  • Loading branch information
Jude Taylor committed Jan 14, 2017
1 parent ae8ec5a commit 14da7be
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
Expand Up @@ -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.
Expand Down

0 comments on commit 14da7be

Please sign in to comment.