about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@Yahoo.com>2017-09-22 19:09:39 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-01-02 21:04:14 -0500
commitbc066466fbdd38c1982ea162d01b74d7df88e874 (patch)
treeaccb2a28bb54ce2e86bf0311bb387ad7f2f4ea65 /pkgs/development/haskell-modules
parentfaa4b45a1eff573b5773dd686e2a7f07c9986598 (diff)
downloadnixlib-bc066466fbdd38c1982ea162d01b74d7df88e874.tar
nixlib-bc066466fbdd38c1982ea162d01b74d7df88e874.tar.gz
nixlib-bc066466fbdd38c1982ea162d01b74d7df88e874.tar.bz2
nixlib-bc066466fbdd38c1982ea162d01b74d7df88e874.tar.lz
nixlib-bc066466fbdd38c1982ea162d01b74d7df88e874.tar.xz
nixlib-bc066466fbdd38c1982ea162d01b74d7df88e874.tar.zst
nixlib-bc066466fbdd38c1982ea162d01b74d7df88e874.zip
haskell generic-builder: Don't use absolute path to tools, and also track strip
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/generic-builder.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index d24b2ca4143b..29bcdfce2c93 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -111,9 +111,10 @@ let
   crossCabalFlags = [
     "--with-ghc=${ghc.targetPrefix}ghc"
     "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"
-    "--with-gcc=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
-    "--with-ld=${stdenv.cc.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ld"
-    "--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
+    "--with-gcc=${stdenv.cc.targetPrefix}cc"
+    "--with-ld=${stdenv.cc.bintools.targetPrefix}ld"
+    "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" # not cross one
+    "--with-strip=${stdenv.cc.bintools.targetPrefix}strip"
   ] ++ (if isHaLVM then [] else ["--hsc2hs-options=--cross-compile"]);
 
   crossCabalFlagsString =