diff options
| author | maralorn <mail@maralorn.de> | 2024-01-06 21:46:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-06 21:46:01 +0100 |
| commit | 832df82ffcdc0b85f3fb38674732a56b86d0edab (patch) | |
| tree | ba066e77f1133140e307353848187d25845f2050 /pkgs/development/haskell-modules | |
| parent | 38c8bdcb53139b25517a211105b18c0461d53b5a (diff) | |
| parent | 0b7863d3e38bcb48fd7fcb3b70e99b77f6843dae (diff) | |
| download | nixlib-832df82ffcdc0b85f3fb38674732a56b86d0edab.tar nixlib-832df82ffcdc0b85f3fb38674732a56b86d0edab.tar.gz nixlib-832df82ffcdc0b85f3fb38674732a56b86d0edab.tar.bz2 nixlib-832df82ffcdc0b85f3fb38674732a56b86d0edab.tar.lz nixlib-832df82ffcdc0b85f3fb38674732a56b86d0edab.tar.xz nixlib-832df82ffcdc0b85f3fb38674732a56b86d0edab.tar.zst nixlib-832df82ffcdc0b85f3fb38674732a56b86d0edab.zip | |
Merge pull request #279232 from sternenseemann/system-double-conversion
haskellPackages.double-conversion: don't use vendored library
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c65a249fb554..c37093e7020f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -329,6 +329,11 @@ self: super: builtins.intersectAttrs super { # Heist's test suite requires system pandoc heist = addTestToolDepend pkgs.pandoc super.heist; + # Use Nixpkgs' double-conversion library + double-conversion = disableCabalFlag "embedded_double_conversion" ( + addBuildDepends [ pkgs.double-conversion ] super.double-conversion + ); + # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 gio = lib.pipe super.gio [ (disableHardening ["fortify"]) |