diff options
| author | Ryan Trinkle <ryan.trinkle@gmail.com> | 2014-08-25 18:46:52 -0400 |
|---|---|---|
| committer | Ryan Trinkle <ryan.trinkle@gmail.com> | 2014-08-25 18:46:52 -0400 |
| commit | 1c9166f64999dc0a74c23574725bd62d4661e415 (patch) | |
| tree | 9020d91b52afcbda9fb12b919ec3146016ab10ea /pkgs/build-support/cabal | |
| parent | 983af4a9213f75b0e8380d6e68fb7ead1f5d217f (diff) | |
| download | nixpkgs-1c9166f64999dc0a74c23574725bd62d4661e415.tar nixpkgs-1c9166f64999dc0a74c23574725bd62d4661e415.tar.gz nixpkgs-1c9166f64999dc0a74c23574725bd62d4661e415.tar.bz2 nixpkgs-1c9166f64999dc0a74c23574725bd62d4661e415.tar.lz nixpkgs-1c9166f64999dc0a74c23574725bd62d4661e415.tar.xz nixpkgs-1c9166f64999dc0a74c23574725bd62d4661e415.tar.zst nixpkgs-1c9166f64999dc0a74c23574725bd62d4661e415.zip | |
Factor out ghcjs's libdir better.
Diffstat (limited to 'pkgs/build-support/cabal')
| -rw-r--r-- | pkgs/build-support/cabal/ghcjs.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cabal/ghcjs.nix b/pkgs/build-support/cabal/ghcjs.nix index d74c30180e2..e6bc50f4516 100644 --- a/pkgs/build-support/cabal/ghcjs.nix +++ b/pkgs/build-support/cabal/ghcjs.nix @@ -188,7 +188,7 @@ in done done - configureFlags+=" --package-db=${ghc.ghc}/share/ghcjs/x86_64-linux-0.1.0-7.8.2/ghcjs/package.conf.d" + configureFlags+=" --package-db=${ghc.ghc}${ghc.ghc.libdir}/ghcjs/package.conf.d" ${optionalString (self.enableSharedExecutables && self.stdenv.isLinux) '' configureFlags+=" --ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.ghc.name}/${self.pname}-${self.version}"; |