diff options
| author | Peter Simons <simons@cryp.to> | 2015-05-31 23:07:11 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-05-31 23:07:11 +0200 |
| commit | 845bf204df01b7aa80afee0bd794c2e3373e697b (patch) | |
| tree | e545e8cd13c536e310f1457ccf6e2cb622643693 | |
| parent | f99ec984d797b47f5a836e1bdf3ef344b5546072 (diff) | |
| parent | 82bd3a558088f0abc7cf5af27b5fd9024fbc341a (diff) | |
| download | nixpkgs-845bf204df01b7aa80afee0bd794c2e3373e697b.tar nixpkgs-845bf204df01b7aa80afee0bd794c2e3373e697b.tar.gz nixpkgs-845bf204df01b7aa80afee0bd794c2e3373e697b.tar.bz2 nixpkgs-845bf204df01b7aa80afee0bd794c2e3373e697b.tar.lz nixpkgs-845bf204df01b7aa80afee0bd794c2e3373e697b.tar.xz nixpkgs-845bf204df01b7aa80afee0bd794c2e3373e697b.tar.zst nixpkgs-845bf204df01b7aa80afee0bd794c2e3373e697b.zip | |
Merge pull request #8095 from ryantrinkle/fix-install-name-tool
Do not use install_name_tool on "executables" built by GHCJS
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index d441b824842..edff84a0403 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -244,7 +244,7 @@ stdenv.mkDerivation ({ mv $packageConfFile $packageConfDir/$pkgId.conf ''} - ${optionalString (enableSharedExecutables && isExecutable && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' + ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' for exe in "$out/bin/"* ; do install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe" done |