diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2022-03-31 12:50:43 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2022-03-31 12:50:43 +0200 |
| commit | 456faf71e5a842128589e0b44dea3d426fa87e40 (patch) | |
| tree | 3ae1eacda3ffea22d7743675c31fcf0b5eac4a84 | |
| parent | 78a93b5352a26bbbad4a9f22f0fcdaf76f5dc176 (diff) | |
| download | nixpkgs-456faf71e5a842128589e0b44dea3d426fa87e40.tar nixpkgs-456faf71e5a842128589e0b44dea3d426fa87e40.tar.gz nixpkgs-456faf71e5a842128589e0b44dea3d426fa87e40.tar.bz2 nixpkgs-456faf71e5a842128589e0b44dea3d426fa87e40.tar.lz nixpkgs-456faf71e5a842128589e0b44dea3d426fa87e40.tar.xz nixpkgs-456faf71e5a842128589e0b44dea3d426fa87e40.tar.zst nixpkgs-456faf71e5a842128589e0b44dea3d426fa87e40.zip | |
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.
| -rw-r--r-- | pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 65a575e08e8..c478c875540 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -51,7 +51,7 @@ let ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" - else "$out/lib/${ghcCommand}-${ghc.version}"; + else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); |