diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-05-20 01:39:43 +0200 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-05-20 01:39:43 +0200 |
| commit | 1849de11ec1e32e9eebb83f24d5339bea88b7ed7 (patch) | |
| tree | 0aaf3cead09c2d55c67c6f6a86ad20af399797d8 /nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix | |
| parent | 304c06d7a7ea3f5c84031d325ece8d38b8c1d829 (diff) | |
| parent | 0f5ce2fac0c726036ca69a5524c59a49e2973dd4 (diff) | |
Merge commit '0f5ce2fac0c726036ca69a5524c59a49e2973dd4'
Diffstat (limited to 'nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix b/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix index 49beed8549d..08119018874 100644 --- a/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -127,7 +127,18 @@ symlinkJoin { rm $f-tmp done '') + '' - ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} + ${lib.optionalString hasLibraries '' + # GHC 8.10 changes. + # Instead of replacing package.cache[.lock] with the new file, + # ghc-pkg is now trying to open the file. These file are symlink + # to another nix derivation, so they are not writable. Removing + # them allow the correct behavior of ghc-pkg recache + # See: https://github.com/NixOS/nixpkgs/issues/79441 + rm $out/lib/${ghc.name}/package.conf.d/package.cache.lock + rm $out/lib/${ghc.name}/package.conf.d/package.cache + + $out/bin/${ghcCommand}-pkg recache + ''} ${# ghcjs will read the ghc_libdir file when resolving plugins. lib.optionalString (isGhcjs && ghcLibdir != null) '' mkdir -p "${libDir}" |