b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskellPackages.GLUT: make sure patch applies despite revisions

Browse source 
(by fixing line endings using dos2unix)
This commit is contained in:
sternenseemann 2023-09-03 17:22:48 +02:00
parent 8f93c4379f
commit 5c58c59c4e
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -601,7 +601,17 @@ self: super: builtins.intersectAttrs super {
#
# 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 pkgs.freeglut (appendPatch ./patches/GLUT.patch super.GLUT);
${if pkgs.stdenv.isDarwin then null else "GLUT"} = overrideCabal (drv: {
pkg-configDepends = drv.pkg-configDepends or [] ++ [
pkgs.freeglut
];
patches = drv.patches or [] ++ [
./patches/GLUT.patch
];
prePatch = drv.prePatch or "" + ''
${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
'';
}) super.GLUT;
libsystemd-journal = doJailbreak (addExtraLibrary pkgs.systemd super.libsystemd-journal);