From f1a4cca7745bd513576f553314e8d37ccf3caa27 Mon Sep 17 00:00:00 2001
From: Mio <mio@mio19.uk>
Date: Wed, 14 Jan 2026 16:13:52 +1100
Subject: [PATCH 1/3] speed-dreams: 2.3.0-r8786 -> 2.4.2

---
 pkgs/games/speed-dreams/default.nix | 131 ++++++++++++++--------------
 1 file changed, 67 insertions(+), 64 deletions(-)

diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix
index 520439b2321b..b257e77934fd 100644
--- a/pkgs/games/speed-dreams/default.nix
+++ b/pkgs/games/speed-dreams/default.nix
@@ -1,5 +1,4 @@
 {
-  fetchurl,
   lib,
   stdenv,
   libGLU,
@@ -32,83 +31,83 @@
   libvorbis,
   runtimeShell,
   curl,
+  fetchgit,
+  cjson,
+  minizip,
+  rhash,
   copyDesktopItems,
-  makeDesktopItem,
 }:
 
-let
-  version = "2.3.0-r8786";
-  shortVersion = builtins.substring 0 5 version;
-in
 stdenv.mkDerivation rec {
-  inherit version;
+  version = "2.4.2";
   pname = "speed-dreams";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-base-${version}.tar.xz";
-    sha256 = "sha256-DUyMs9Hr1PYgmNVwBY/e6snVeGl9GX0AnZ7S+TFABKQ=";
+  src = fetchgit {
+    url = "https://forge.a-lec.org/speed-dreams/speed-dreams-code.git";
+    rev = "v${version}";
+    sha256 = "sha256-ZY/0tf0wFbepEUNqpaBA4qgkWDij/joqPtbiF/48oN4=";
+    fetchSubmodules = true;
   };
-
-  cars-and-tracks = fetchurl {
-    url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-hq-cars-and-tracks-${version}.tar.xz";
-    sha256 = "sha256-WT+W6uuw4BRSbF1Cw123q3v9qSCvBQ7TcQ/Y0RV/7Js=";
-  };
-
-  more-cars-and-tracks = fetchurl {
-    url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-more-hq-cars-and-tracks-${version}.tar.xz";
-    sha256 = "sha256-psApv+Z1HDFvh5bzt125mo/ZvO5rjee/KhOf45iKnKk=";
-  };
-
-  wip-cars-and-tracks = fetchurl {
-    url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-wip-cars-and-tracks-${version}.tar.xz";
-    sha256 = "sha256-OEAbqFfO2PzHP7+eAtPNn3Ql6fYNTKzzQW8lHe9KDXM=";
-  };
-
-  sourceRoot = ".";
-
-  postUnpack = ''
-    echo Unpacking data
-    tar -xf ${cars-and-tracks}
-    tar -xf ${more-cars-and-tracks}
-    tar -xf ${wip-cars-and-tracks}
-  '';
-
-  preBuild = ''
-    make -C src/libs/portability
-    make -C src/libs/portability portability.o
-    ar -rv "$(echo lib*/games/speed-dreams*/lib)"/libportability_static.a src/libs/portability/CMakeFiles/portability.dir/portability.cpp.o
-    export NIX_LDFLAGS="$NIX_LDFLAGS -L$(echo $PWD/lib*/games/speed-dreams*/lib) -lexpat"
-    echo "libportability_static.a built"
-  '';
+  NIX_CFLAGS_COMPILE = "-I${src}/src/libs/tgf -I${src}/src/libs/tgfdata -I${src}/src/interfaces -I${src}/src/libs/math -I${src}/src/libs/portability";
 
   postInstall = ''
-    mkdir "$out/bin"
-    for i in "$out"/games/*; do
-      echo '#!${runtimeShell}' >> "$out/bin/$(basename "$i")"
-      echo "$i"' "$@"' >> "$out/bin/$(basename "$i")"
-      chmod a+x "$out/bin/$(basename "$i")"
-    done
+    mkdir -p "$out/bin"
+    # Wrapper for main executable
+    cat > "$out/bin/speed-dreams" <<EOF
+    #!${runtimeShell}
+    export LD_LIBRARY_PATH="$out/lib/games/speed-dreams-2/lib:$out/lib:${
+      lib.makeLibraryPath [
+        libGL
+        libGLU
+        libglut
+        libX11
+        plib
+        openal
+        freealut
+        libXrandr
+        libXext
+        libSM
+        libICE
+        libXi
+        libXt
+        libXrender
+        libXxf86vm
+        openscenegraph
+        expat
+        libpng
+        zlib
+        SDL2
+        SDL2_mixer
+        enet
+        libjpeg
+        libvorbis
+        curl
+        cjson
+        minizip
+        rhash
+        stdenv.cc.cc.lib
+      ]
+    }"
+    if [ -e "${libGL}/lib/libGL.so.1" ]; then
+      export LD_PRELOAD="${libGL}/lib/libGL.so.1''${LD_PRELOAD:+:$LD_PRELOAD}"
+    fi
+    export SDL_VIDEODRIVER="x11"
+    exec "$out/games/speed-dreams-2" "$@"
+    EOF
+    chmod a+x "$out/bin/speed-dreams"
 
+    # Symlink for desktop icon
     mkdir -p $out/share/pixmaps/
     ln -s "$out/share/games/speed-dreams-2/data/icons/icon.png" "$out/share/pixmaps/speed-dreams-2.png"
+    substituteInPlace "$out/share/applications/speed-dreams.desktop" \
+      --replace-fail "Exec=$out/games/speed-dreams-2" "Exec=$out/bin/speed-dreams" \
+      --replace-fail "Icon=/build/speed-dreams-code/speed-dreams-data/data/data/icons/icon.png" "Icon=$out/share/pixmaps/speed-dreams-2.png"
   '';
 
-  desktopItems = [
-    (makeDesktopItem {
-      name = "Speed Dreams 2";
-      exec = "speed-dreams-2";
-      icon = "speed-dreams-2.png";
-      desktopName = "speed-dreams-2";
-      comment = "The Open Racing Car Simulator Fork";
-      categories = [
-        "Application"
-        "Game"
-      ];
-    })
-  ];
-
   # RPATH of binary /nix/store/.../lib64/games/speed-dreams-2/drivers/shadow_sc/shadow_sc.so contains a forbidden reference to /build/
-  cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ];
+  cmakeFlags = [
+    "-DCMAKE_SKIP_BUILD_RPATH=ON"
+  ];
 
   nativeBuildInputs = [
     pkg-config
@@ -144,14 +143,18 @@ stdenv.mkDerivation rec {
     openscenegraph
     libvorbis
     curl
+    cjson
+    minizip
+    rhash
   ];
 
   meta = {
     description = "Car racing game - TORCS fork with more experimental approach";
-    homepage = "https://speed-dreams.sourceforge.net/";
+    homepage = "https://www.speed-dreams.net/";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ raskin ];
     platforms = lib.platforms.linux;
     hydraPlatforms = [ ];
+    mainProgram = "speed-dreams";
   };
 }

From 964a2e05376a49d8cc6a9844784ac89f3d4281dc Mon Sep 17 00:00:00 2001
From: Mio <mio@mio19.uk>
Date: Fri, 16 Jan 2026 13:41:01 +1100
Subject: [PATCH 2/3] speed-dreams: remove empty hydraPlatforms

---
 pkgs/games/speed-dreams/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix
index b257e77934fd..64940145ddb1 100644
--- a/pkgs/games/speed-dreams/default.nix
+++ b/pkgs/games/speed-dreams/default.nix
@@ -154,7 +154,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ raskin ];
     platforms = lib.platforms.linux;
-    hydraPlatforms = [ ];
     mainProgram = "speed-dreams";
   };
 }

From 61e63662834ac72f93e7115837f0020a489a581a Mon Sep 17 00:00:00 2001
From: Mio <mio@mio19.uk>
Date: Fri, 16 Jan 2026 18:02:00 +1100
Subject: [PATCH 3/3] speed-dreams: move to by-name

---
 .../default.nix => by-name/sp/speed-dreams/package.nix}     | 6 +++---
 pkgs/top-level/all-packages.nix                             | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)
 rename pkgs/{games/speed-dreams/default.nix => by-name/sp/speed-dreams/package.nix} (98%)

diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/by-name/sp/speed-dreams/package.nix
similarity index 98%
rename from pkgs/games/speed-dreams/default.nix
rename to pkgs/by-name/sp/speed-dreams/package.nix
index 64940145ddb1..b314ef9aeadc 100644
--- a/pkgs/games/speed-dreams/default.nix
+++ b/pkgs/by-name/sp/speed-dreams/package.nix
@@ -19,7 +19,7 @@
   libXxf86vm,
   openscenegraph,
   expat,
-  libpng,
+  libpng12,
   zlib,
   bash,
   SDL2,
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
         libXxf86vm
         openscenegraph
         expat
-        libpng
+        libpng12
         zlib
         SDL2
         SDL2_mixer
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libpng
+    libpng12
     libGLU
     libGL
     libglut
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 746d96f57baf..4b59e3632076 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12746,12 +12746,6 @@ with pkgs;
 
   tibia = pkgsi686Linux.callPackage ../games/tibia { };
 
-  speed_dreams = callPackage ../games/speed-dreams {
-    # Torcs wants to make shared libraries linked with plib libraries (it provides static).
-    # i686 is the only platform I know than can do that linking without plib built with -fPIC
-    libpng = libpng12;
-  };
-
   ultrastar-creator = libsForQt5.callPackage ../tools/misc/ultrastar-creator { };
 
   ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };