diff options
author | sternenseemann <sternenseemann@systemli.org> | 2023-11-05 16:56:21 +0100 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-11-05 16:57:03 +0100 |
commit | c31f00657042dcb85e45777be4f3701032a4f2f5 (patch) | |
tree | 0809b0f96819b3a7488bf6625d219927796e4fed | |
parent | 4c56be2a7e100a5afe2c4b859740be96f5d5ea62 (diff) | |
download | nixpkgs-c31f00657042dcb85e45777be4f3701032a4f2f5.tar nixpkgs-c31f00657042dcb85e45777be4f3701032a4f2f5.tar.gz nixpkgs-c31f00657042dcb85e45777be4f3701032a4f2f5.tar.bz2 nixpkgs-c31f00657042dcb85e45777be4f3701032a4f2f5.tar.lz nixpkgs-c31f00657042dcb85e45777be4f3701032a4f2f5.tar.xz nixpkgs-c31f00657042dcb85e45777be4f3701032a4f2f5.tar.zst nixpkgs-c31f00657042dcb85e45777be4f3701032a4f2f5.zip |
haskellPackages.sdl2-ttf: work around sdl2 pkg-config issue
Ref https://github.com/NixOS/nixpkgs/issues/260863.
3 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8044cc26567..ba926f59412 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 9c56ae663e4..24650b195a7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 58d8683c9dd..65a47e4045f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -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 |