diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-09-03 17:22:48 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-09-03 17:23:53 +0200 |
| commit | 5c58c59c4e75ab7b6a58b43503da8b14c08a27d2 (patch) | |
| tree | 177b5f984f2bba01adce9f275dacdc0e4ce275a7 /pkgs/development/haskell-modules | |
| parent | 8f93c4379f0a616cc1295d0f0dbc9b6aa53b3a16 (diff) | |
| download | nixpkgs-5c58c59c4e75ab7b6a58b43503da8b14c08a27d2.tar nixpkgs-5c58c59c4e75ab7b6a58b43503da8b14c08a27d2.tar.gz nixpkgs-5c58c59c4e75ab7b6a58b43503da8b14c08a27d2.tar.bz2 nixpkgs-5c58c59c4e75ab7b6a58b43503da8b14c08a27d2.tar.lz nixpkgs-5c58c59c4e75ab7b6a58b43503da8b14c08a27d2.tar.xz nixpkgs-5c58c59c4e75ab7b6a58b43503da8b14c08a27d2.tar.zst nixpkgs-5c58c59c4e75ab7b6a58b43503da8b14c08a27d2.zip | |
haskellPackages.GLUT: make sure patch applies despite revisions
(by fixing line endings using dos2unix)
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 19a19139481..6242b5af6f4 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -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); |