diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-11-05 16:47:56 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-11-05 16:47:56 +0100 |
| commit | 0ee702c43936f4fb169b53916b3f3251ffcc5441 (patch) | |
| tree | bdfe12c920de43f205c376f7bf1ae304010f31e8 | |
| parent | 85f6f759598316052872e46c1cf1ccd4a6976ae3 (diff) | |
| download | nixpkgs-0ee702c43936f4fb169b53916b3f3251ffcc5441.tar nixpkgs-0ee702c43936f4fb169b53916b3f3251ffcc5441.tar.gz nixpkgs-0ee702c43936f4fb169b53916b3f3251ffcc5441.tar.bz2 nixpkgs-0ee702c43936f4fb169b53916b3f3251ffcc5441.tar.lz nixpkgs-0ee702c43936f4fb169b53916b3f3251ffcc5441.tar.xz nixpkgs-0ee702c43936f4fb169b53916b3f3251ffcc5441.tar.zst nixpkgs-0ee702c43936f4fb169b53916b3f3251ffcc5441.zip | |
haskellPackages.sdl2-gfx: work around sdl2 pkg-config issue
Ref https://github.com/NixOS/nixpkgs/issues/260863.
3 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ce0ff69bdf7..8044cc26567 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d2ad1b3d80c..9c56ae663e4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0bdcbbee939..58d8683c9dd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -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 |