Merge master into staging-next

2021-05-13 00:56:26 +00:00
parent ba2140b657 d950065319
commit a8e5ac148b
31 changed files with 438 additions and 149 deletions
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation {

  # Add the packInstall path to the swipl pack search path
  postPatch = ''
-    echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> /build/$sourceRoot/boot/init.pl
+    echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> boot/init.pl
  '';

  nativeBuildInputs = [ cmake pkg-config ];