Fix unlit and other lib/bin tools for ghc
commit2a2d2dd7b4f95f11257757e36c10883a21712f3d
authorMoritz Angermann <moritz.angermann@gmail.com>
dateFri 10 May 2019, 23:21 (7 years ago)
parent5a12019
builder/comp-builder.nix+1−1
@@ -188,7 +188,7 @@ let
188188 # the target dir for haddock documentation
189189 docdir = docoutput: docoutput + "/share/doc/" + componentId.cname;
190190
191− doHaddock' = doHaddock
191+ doHaddock' = doHaddock
192192 && (haskellLib.isLibrary componentId)
193193 && stdenv.hostPlatform == stdenv.buildPlatform;
194194
builder/with-package-wrapper.nix+3
@@ -36,6 +36,9 @@ in runCommand "${ghc.name}-with-${package.identifier.name}" {
3636 # ...and replace package database with the one from target package config.
3737 rm -rf ${libDir}
3838 mkdir -p ${libDir}
39+ # ... yet retain the lib/.../bin directory. This contains `unlit' and friends.
40+ ${lndir}/bin/lndir -silent ${ghc}/lib/${ghcCommand}-${ghc.version}/bin ${libDir}
41+
3942 ln -s ${configFiles}/package.conf.d ${packageCfgDir}
4043
4144 # Wrap compiler executables with correct env variables.