public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32993 from shlevy/haskell-internal-libs

Browse Source 
haskell generic-builder: Support installing internal libs.
This commit is contained in:
Peter Simons 2017-12-29 15:41:19 +01:00 committed by GitHub
commit 504016f753
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -317,8 +317,14 @@ stdenv.mkDerivation ({
local packageConfFile="$packageConfDir/${pname}-${version}.conf" local packageConfFile="$packageConfDir/${pname}-${version}.conf"
mkdir -p "$packageConfDir" mkdir -p "$packageConfDir"
${setupCommand} register --gen-pkg-config=$packageConfFile ${setupCommand} register --gen-pkg-config=$packageConfFile
local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) if [ -d "$packageConfFile" ]; then
mv $packageConfFile $packageConfDir/$pkgId.conf 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 '' ${optionalString isGhcjs ''
for exeDir in "$out/bin/"*.jsexe; do for exeDir in "$out/bin/"*.jsexe; do