diff options
| author | Peter Simons <simons@cryp.to> | 2013-12-16 21:13:24 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-12-16 21:13:24 +0100 |
| commit | 45e8de9a7d457e5202d17fcbf4a6c58afa3388e8 (patch) | |
| tree | 35ce6756899dca5d77087fa2f06c781f42a9a6a3 /pkgs/build-support | |
| parent | 2bc29e4e6d3713d106de670b55e8789267f7acc7 (diff) | |
| parent | 60103a4bd99cce63dab60be358e0ba90724b8b21 (diff) | |
| download | nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.gz nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.bz2 nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.lz nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.xz nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.zst nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.zip | |
Merge branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/tools/misc/less/default.nix
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cabal/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index b17f720e5618..d99faf41f88d 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -156,7 +156,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; (optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla")) (optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic")) (optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests")) - ]; + ] ++ optional self.enableSharedExecutables "--ghc-option=-optl=-Wl,-rpath=$ORIGIN/../lib/${ghc.ghc.name}/${self.pname}-${self.version}"; # GHC needs the locale configured during the Haddock phase. LANG = "en_US.UTF-8"; |