git.iko.soy/typeable/nixpkgs
on master help sign in
ghcWithPackages: use haskellCompilerName for ghclibdir

This is done for consistency with generic-builder.nix and because it's easier for downstream users to replicate which will inevitably use our code as inspiration.

commit456faf71e5a842128589e0b44dea3d426fa87e40 authorsternenseemann <sternenseemann@systemli.org> dateThu 31 Mar 2022, 12:50 (5 years ago) parent78a93b5
1 file changed+1−1
pkgs/development/haskell-modules/with-packages-wrapper.nix+1−1
pkgs/development/haskell-modules/with-packages-wrapper.nix+1−1
@@ -51,7 +51,7 @@ let
5151 ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
5252 ghcCommandCaps= lib.toUpper ghcCommand';
5353 libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}"
54− else "$out/lib/${ghcCommand}-${ghc.version}";
54+ else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}";
5555 docDir = "$out/share/doc/ghc/html";
5656 packageCfgDir = "${libDir}/package.conf.d";
5757 paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages);