opensmalltalk-vm: 202206021410 -> 202312181441

pkgs/development/compilers/opensmalltalk-vm/default.nix

@@ -16,6 +16,7 @@
   pango,
   pkg-config,
   xorg,
+  libGL,
 }:
 let
   buildVM =
@@ -31,8 +32,8 @@ let
       src = fetchFromGitHub {
         owner = "OpenSmalltalk";
         repo = "opensmalltalk-vm";
-        tag = "202206021410";
-        hash = "sha256-QqElPiJuqD5svFjWrLz1zL0Tf+pHxQ2fPvkVRn2lyBI=";
+        tag = "202312181441";
+        hash = "sha256-j8fVL8072ccdaRyW5sPDcYXxMcIZIvSFJ+4Q1+41ey0=";
       };
     in
     stdenv.mkDerivation {
@@ -45,6 +46,10 @@ let
 
       inherit src;
 
+      # Fixes build errors triggered by the format-security compiler flag
+      # and caused by passing non-literals as the first argument to printf.
+      patches = [ ./printOptionStrings.patch ];
+
       postPatch = ''
         vmVersionFiles=$(sed -n 's/^versionfiles="\(.*\)"/\1/p' ./scripts/updateSCCSVersions)
         for vmVersionFile in $vmVersionFiles; do
@@ -74,9 +79,12 @@ let
 
       configureFlags = [ "--with-scriptname=${scriptName}" ] ++ configureFlags;
 
-      buildFlags = [ "all" ];
+      buildFlags = [
+        "getversion"
+        "all"
+      ];
 
-      enableParallelBuilding = true;
+      enableParallelBuilding = false;
 
       nativeBuildInputs = [
         file
@@ -86,6 +94,7 @@ let
       buildInputs = [
         alsa-lib
         freetype
+        libGL
         libpulseaudio
         libtool
         libuuid
@@ -106,7 +115,7 @@ let
       '';
 
       meta = {
-        description = "Cross-platform virtual machine for Squeak, Pharo, Cuis, and Newspeak";
+        description = "Cross-platform virtual machine for Squeak, Pharo, and Cuis";
         mainProgram = scriptName;
         homepage = "https://opensmalltalk.org/";
         license = with lib.licenses; [ mit ];
@@ -123,7 +132,7 @@ let
         scriptName = "squeak";
         configureFlagsArray = ''
           (
-            CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -DCOGMTVM=0 -DDUAL_MAPPED_CODE_ZONE=1"
+            CFLAGS="-fpermissive -DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -DCOGMTVM=0 -DDUAL_MAPPED_CODE_ZONE=1"
             LIBS="-lrt"
           )
         '';
@@ -132,6 +141,7 @@ let
           "--with-src=src/spur64.cog"
           "--without-npsqueak"
           "--enable-fast-bitblt"
+          "--disable-dynamicopenssl"
         ];
       };
 
@@ -141,49 +151,34 @@ let
         scriptName = "squeak";
         configureFlagsArray = ''
           (
-            CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__"
+            CFLAGS="-fpermissive -DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__"
           )
         '';
         configureFlags = [
           "--with-vmversion=5.0"
           "--with-src=src/spur64.stack"
           "--disable-cogit"
           "--without-npsqueak"
+          "--disable-dynamicopenssl"
         ];
       };
     };
 
     "x86_64-linux" = {
-      "newspeak-cog-spur" = buildVM {
-        platformDir = "linux64x64";
-        vmName = "newspeak.cog.spur";
-        scriptName = "newspeak";
-        configureFlagsArray = ''
-          (
-            CFLAGS="-DNDEBUG -DDEBUGVM=0"
-          )
-        '';
-        configureFlags = [
-          "--with-vmversion=5.0"
-          "--with-src=src/spur64.cog.newspeak"
-          "--without-vm-display-fbdev"
-          "--without-npsqueak"
-        ];
-      };
-
       "squeak-cog-spur" = buildVM {
         platformDir = "linux64x64";
         vmName = "squeak.cog.spur";
         scriptName = "squeak";
         configureFlagsArray = ''
           (
-            CFLAGS="-DNDEBUG -DDEBUGVM=0 -DCOGMTVM=0"
+            CFLAGS="-fpermissive -DNDEBUG -DDEBUGVM=0 -DCOGMTVM=0"
           )
         '';
         configureFlags = [
           "--with-vmversion=5.0"
           "--with-src=src/spur64.cog"
           "--without-npsqueak"
+          "--disable-dynamicopenssl"
         ];
       };
     };

pkgs/development/compilers/opensmalltalk-vm/printOptionStrings.patch

@@ -0,0 +1,26 @@
+diff --git a/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m b/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m
+index d248e9fd0..0ae695061 100644
+--- a/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m
++++ b/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m
+@@ -559,7 +559,7 @@ printOptionStrings()
+ 			sizeof(char *),
+ 			(int (*)(const void*,const void*))sortStrings);
+ 	while (--count >= 0)
+-		printf(optionStrings[count]);
++		printf("%s", optionStrings[count]);
+ }
+
+ - (void) printUsage {
+diff --git a/platforms/unix/vm/sqUnixMain.c b/platforms/unix/vm/sqUnixMain.c
+index 4795563f5..419f527e3 100644
+--- a/platforms/unix/vm/sqUnixMain.c
++++ b/platforms/unix/vm/sqUnixMain.c
+@@ -1829,7 +1829,7 @@ printOptionStrings()
+ 			sizeof(char *),
+ 			(int (*)(const void*,const void*))sortStrings);
+ 	while (--count >= 0)
+-		printf(optionStrings[count]);
++		printf("%s", optionStrings[count]);
+ }
+
+ void