diff options
| author | Shea Levy <shea@shealevy.com> | 2017-12-22 19:25:59 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-12-22 19:44:37 -0500 |
| commit | b6d215aa79f796812f5809d0618a56e6e7003c62 (patch) | |
| tree | bb1a91fdcf49ff0cf6aad5bf02f7d74ad162ec3f /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | 857a71cbc51017ad660316f860a6fccf1a700c67 (diff) | |
| download | nixlib-b6d215aa79f796812f5809d0618a56e6e7003c62.tar nixlib-b6d215aa79f796812f5809d0618a56e6e7003c62.tar.gz nixlib-b6d215aa79f796812f5809d0618a56e6e7003c62.tar.bz2 nixlib-b6d215aa79f796812f5809d0618a56e6e7003c62.tar.lz nixlib-b6d215aa79f796812f5809d0618a56e6e7003c62.tar.xz nixlib-b6d215aa79f796812f5809d0618a56e6e7003c62.tar.zst nixlib-b6d215aa79f796812f5809d0618a56e6e7003c62.zip | |
haskell generic-builder: Support installing internal libs.
Fixes #32980.
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -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 |