BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

haskell: cosmetic changes to the generic builder

Browse source
This commit is contained in:
Peter Simons 2018-01-31 17:41:03 +01:00
parent 830ccafedc
commit 1b0c67259e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/haskell-modules/generic-builder.nix
View file

@ -330,10 +330,10 @@ stdenv.mkDerivation ({
mkdir -p "$packageConfDir" mkdir -p "$packageConfDir"
${setupCommand} register --gen-pkg-config=$packageConfFile ${setupCommand} register --gen-pkg-config=$packageConfFile
if [ -d "$packageConfFile" ]; then if [ -d "$packageConfFile" ]; then
mv "$packageConfFile"/* "$packageConfDir" mv "$packageConfFile/"* "$packageConfDir"
rmdir "$packageConfFile" rmdir "$packageConfFile"
fi fi
for packageConfFile in "$packageConfDir"/*; do for packageConfFile in "$packageConfDir/"*; do
local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile )
mv $packageConfFile $packageConfDir/$pkgId.conf mv $packageConfFile $packageConfDir/$pkgId.conf
done done
@ -354,7 +354,7 @@ stdenv.mkDerivation ({
''} ''}
${optionalString enableSeparateDocOutput '' ${optionalString enableSeparateDocOutput ''
for x in ${docdir "$doc"}/html/src/*.html; do for x in ${docdir "$doc"}"/html/src/"*.html; do
remove-references-to -t $out $x remove-references-to -t $out $x
done done
mkdir -p $doc mkdir -p $doc