diff options
| author | Dennis Gosnell <cdep.illabout@gmail.com> | 2023-11-10 09:12:04 +0900 |
|---|---|---|
| committer | Dennis Gosnell <cdep.illabout@gmail.com> | 2023-11-10 09:16:34 +0900 |
| commit | f10a9c90947faa4a399e6c98c9fa0ee5c4ae51c5 (patch) | |
| tree | 7d34b518db31864ae2edaaea65504abfac148d68 /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | 2fe90802da10b14bd6e14c582a5585ac5c56874d (diff) | |
| parent | c31f00657042dcb85e45777be4f3701032a4f2f5 (diff) | |
| download | nixpkgs-f10a9c90947faa4a399e6c98c9fa0ee5c4ae51c5.tar nixpkgs-f10a9c90947faa4a399e6c98c9fa0ee5c4ae51c5.tar.gz nixpkgs-f10a9c90947faa4a399e6c98c9fa0ee5c4ae51c5.tar.bz2 nixpkgs-f10a9c90947faa4a399e6c98c9fa0ee5c4ae51c5.tar.lz nixpkgs-f10a9c90947faa4a399e6c98c9fa0ee5c4ae51c5.tar.xz nixpkgs-f10a9c90947faa4a399e6c98c9fa0ee5c4ae51c5.tar.zst nixpkgs-f10a9c90947faa4a399e6c98c9fa0ee5c4ae51c5.zip | |
Merge branch 'haskell-sdl2-pkg-config-workarounds' into haskell-updates
This is a manual merge of the PR https://github.com/NixOS/nixpkgs/pull/265678 since it has a merge conflict
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 72336ba31b8..723b8e5efba 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -638,7 +638,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,10 @@ self: super: { # Tests rely on (missing) submodule unleash-client-haskell-core = dontCheck super.unleash-client-haskell-core; + + # 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 |