Upgrade to Foundry 11.301

reckenrode · Jun 9, 2023 · aae6c68 · aae6c68
1 parent 6c52bfc
commit aae6c68
Show file tree

Hide file tree

Showing 4 changed files with 2,903 additions and 641 deletions.
diff --git a/pkgs/foundryvtt/default.nix b/pkgs/foundryvtt/default.nix
@@ -24,14 +24,14 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "foundryvtt";
   version = "${finalAttrs.majorVersion}.${finalAttrs.minorVersion}.${finalAttrs.patchVersion}+${finalAttrs.build}";
 
-  majorVersion = "10";
+  majorVersion = "11";
   minorVersion = "0";
   patchVersion = "0";
-  build = "291";
+  build = "301";
 
   src = requireFile {
     name = "FoundryVTT-${finalAttrs.majorVersion}.${finalAttrs.build}.zip";
-    sha256 = "0j9xjqqpl8maggi45wskajxl2c9jlcl8pw1cx6nmgbcj5w4c5xrf";
+    sha256 = "1r5bqhd3cfq3yvzb1yybgvysbhbjqv6d2f768b063fdsdq2ixi2s";
     url = "https://foundryvtt.com";
   };
 

diff --git a/pkgs/foundryvtt/foundryvtt-deps/default.nix b/pkgs/foundryvtt/foundryvtt-deps/default.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
 
 let
   nodeEnv = import ./node-env.nix {

diff --git a/pkgs/foundryvtt/foundryvtt-deps/node-env.nix b/pkgs/foundryvtt/foundryvtt-deps/node-env.nix
@@ -530,12 +530,15 @@ let
         then
             ln -s $out/lib/node_modules/.bin $out/bin
 
-            # Patch the shebang lines of all the executables
+            # Fixup all executables
             ls $out/bin/* | while read i
             do
                 file="$(readlink -f "$i")"
                 chmod u+rwx "$file"
-                patchShebangs "$file"
+                if isScript "$file"
+                then
+                    sed -i 's/\r$//' "$file"  # convert crlf to lf
+                fi
             done
         fi