diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d4233d489a68..29627ab88bd7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -404,6 +404,9 @@ with haskellLib; # https://github.com/essandess/adblock2privoxy/pull/43 adblock2privoxy = doJailbreak super.adblock2privoxy; + # Missing test file https://gitlab.com/dpwiz/hs-jpeg-turbo/-/issues/1 + jpeg-turbo = dontCheck super.jpeg-turbo; + # Fixes compilation for basement on i686 for GHC >= 9.4 # https://github.com/haskell-foundation/foundation/pull/573 # Patch would not work for GHC >= 9.2 where it breaks compilation on x86_64 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c55acd37e867..277fe49a3ff4 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -599,6 +599,11 @@ builtins.intersectAttrs super { ]; }) super.fltkhs; + # Select dependency discovery method and provide said dependency + jpeg-turbo = enableCabalFlag "pkgconfig" ( + addPkgconfigDepends [ pkgs.libjpeg_turbo ] super.jpeg-turbo + ); + # https://github.com/skogsbaer/hscurses/pull/26 hscurses = addExtraLibrary pkgs.ncurses super.hscurses;