Commit 0ee702c4 authored by sternenseemann's avatar sternenseemann
Browse files

haskellPackages.sdl2-gfx: work around sdl2 pkg-config issue 

Ref https://github.com/NixOS/nixpkgs/issues/260863.
parent 85f6f759

pkgs/development/haskell-modules/configuration-common.nix

+4 −0
Original line number Diff line number Diff line
@@ -2676,4 +2676,8 @@ self: super: { 


  # Too strict bounds on base

  kewar = doJailbreak super.kewar;



  # Workaround for Cabal failing to find nonexistent SDL2 library?!

  # https://github.com/NixOS/nixpkgs/issues/260863

  sdl2-gfx = overrideCabal { __propagatePkgConfigDepends = false; } super.sdl2-gfx;

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

+0 −1
Original line number Diff line number Diff line
@@ -4800,7 +4800,6 @@ broken-packages: 
  - sdl2-cairo-image # failure in job https://hydra.nixos.org/build/233210135 at 2023-09-02

  - sdl2-compositor # failure in job https://hydra.nixos.org/build/233198910 at 2023-09-02

  - sdl2-fps # failure in job https://hydra.nixos.org/build/233195346 at 2023-09-02

  - sdl2-gfx # failure in job https://hydra.nixos.org/build/233236795 at 2023-09-02

  - sdl2-image # failure in job https://hydra.nixos.org/build/233216837 at 2023-09-02

  - sdl2-mixer # failure in job https://hydra.nixos.org/build/233228951 at 2023-09-02

  - sdl2-ttf # failure in job https://hydra.nixos.org/build/233238600 at 2023-09-02

pkgs/development/haskell-modules/hackage-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -263572,9 +263572,7 @@ self: { 
       executablePkgconfigDepends = [ SDL2 SDL2_gfx ];

       description = "Haskell bindings to SDL2_gfx";

       license = lib.licenses.mit;

       hydraPlatforms = lib.platforms.none;

       mainProgram = "sdl2-gfx-example";

       broken = true;

     }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;};















  "sdl2-image" = callPackage