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" <