Merge branch 'staging-next' into staging

2021-05-13 11:42:36 +02:00
parent 5121d67a3c e59f22faf5
commit 0313c77b55
36 changed files with 551 additions and 220 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 ];