gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Ref https://github.com/NixOS/nixpkgs/issues/260863.
This commit is contained in:
sternenseemann
2023-11-05 16:57:03 +01:00
parent 4c56be2a7e
commit c31f006570
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-common.nix
+2 -1
View File
@@ -637,7 +637,6 @@ self: super: {
saltine = dontCheck super.saltine; # https://github.com/tel/saltine/pull/56
scp-streams = dontCheck super.scp-streams;
sdl2 = dontCheck super.sdl2; # the test suite needs an x server
sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention
separated = dontCheck super.separated;
shadowsocks = dontCheck super.shadowsocks;
shake-language-c = dontCheck super.shake-language-c;
@@ -2680,4 +2679,6 @@ self: super: {
# Workaround for Cabal failing to find nonexistent SDL2 library?!
# https://github.com/NixOS/nixpkgs/issues/260863
sdl2-gfx = overrideCabal { __propagatePkgConfigDepends = false; } super.sdl2-gfx;
sdl2-ttf = overrideCabal { __onlyPropagateKnownPkgConfigModules = true; } super.sdl2-ttf;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
-1
View File
@@ -4802,7 +4802,6 @@ broken-packages:
- sdl2-fps # failure in job https://hydra.nixos.org/build/233195346 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
- sdp # failure in job https://hydra.nixos.org/build/233246702 at 2023-09-02
- seacat # failure in job https://hydra.nixos.org/build/233229959 at 2023-09-02
- seakale # failure in job https://hydra.nixos.org/build/233236200 at 2023-09-02
pkgs/development/haskell-modules/hackage-packages.nix
Generated
-2
View File
@@ -263666,8 +263666,6 @@ self: {
description = "Bindings to SDL2_ttf";
license = lib.licenses.bsd3;
badPlatforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
"sdnv" = callPackage