about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorBas van Dijk <v.dijk.bas@gmail.com>2017-04-07 01:28:44 +0200
committerBas van Dijk <v.dijk.bas@gmail.com>2017-04-07 09:44:11 +0200
commitc865b8e35e364e1193770243bc4b41e8178b1982 (patch)
tree03ccd39b7937216b02a05458ada6089f5b347064 /pkgs/development/haskell-modules/configuration-common.nix
parentbde6e3da6f19f75a2b1f44094fabc7139be63c6d (diff)
downloadnixlib-c865b8e35e364e1193770243bc4b41e8178b1982.tar
nixlib-c865b8e35e364e1193770243bc4b41e8178b1982.tar.gz
nixlib-c865b8e35e364e1193770243bc4b41e8178b1982.tar.bz2
nixlib-c865b8e35e364e1193770243bc4b41e8178b1982.tar.lz
nixlib-c865b8e35e364e1193770243bc4b41e8178b1982.tar.xz
nixlib-c865b8e35e364e1193770243bc4b41e8178b1982.tar.zst
nixlib-c865b8e35e364e1193770243bc4b41e8178b1982.zip
haskell: add the linkWithGold function to link packages with ld.gold
Also support linking the double-conversion package with ld.gold.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d84db5279519..643f71f9f874 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -171,7 +171,13 @@ self: super: {
     else dontCheck super.fsnotify;
 
   double-conversion = if !pkgs.stdenv.isDarwin
-    then addExtraLibrary super.double-conversion pkgs.stdenv.cc.cc.lib
+    then addExtraLibrary
+           # https://github.com/bos/double-conversion/pull/17
+           (appendPatch super.double-conversion (pkgs.fetchpatch {
+              url = "https://github.com/basvandijk/double-conversion/commit/0927e347d53dbd96d1949930e728cc2471dd4b14.patch";
+              sha256 = "042yqbq5p6nc9nymmbz9hgp51dlc5asaj9bf91kw5fph6dw2hwg9";
+           }))
+           pkgs.stdenv.cc.cc.lib
     else addExtraLibrary (overrideCabal super.double-conversion (drv:
       {
         postPatch = ''