diff options
| author | Peter Simons <simons@cryp.to> | 2017-12-29 15:41:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-29 15:41:19 +0100 |
| commit | 504016f753bf8df015cf2b27c8dea20d88ad6cfc (patch) | |
| tree | b322037246f888ac373263ce74b4f0dcbe426c42 /pkgs | |
| parent | 3c8cff253e50cf398fa1c28a77f3b23770377ea7 (diff) | |
| parent | b6d215aa79f796812f5809d0618a56e6e7003c62 (diff) | |
| download | nixlib-504016f753bf8df015cf2b27c8dea20d88ad6cfc.tar nixlib-504016f753bf8df015cf2b27c8dea20d88ad6cfc.tar.gz nixlib-504016f753bf8df015cf2b27c8dea20d88ad6cfc.tar.bz2 nixlib-504016f753bf8df015cf2b27c8dea20d88ad6cfc.tar.lz nixlib-504016f753bf8df015cf2b27c8dea20d88ad6cfc.tar.xz nixlib-504016f753bf8df015cf2b27c8dea20d88ad6cfc.tar.zst nixlib-504016f753bf8df015cf2b27c8dea20d88ad6cfc.zip | |
Merge pull request #32993 from shlevy/haskell-internal-libs
haskell generic-builder: Support installing internal libs.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 3182b4846c0f..b80c5df68aa0 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -317,8 +317,14 @@ stdenv.mkDerivation ({ local packageConfFile="$packageConfDir/${pname}-${version}.conf" mkdir -p "$packageConfDir" ${setupCommand} register --gen-pkg-config=$packageConfFile - local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) - mv $packageConfFile $packageConfDir/$pkgId.conf + if [ -d "$packageConfFile" ]; then + mv "$packageConfFile"/* "$packageConfDir" + rmdir "$packageConfFile" + fi + for packageConfFile in "$packageConfDir"/*; do + local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) + mv $packageConfFile $packageConfDir/$pkgId.conf + done ''} ${optionalString isGhcjs '' for exeDir in "$out/bin/"*.jsexe; do |