eduke32: migrate to pkgs/by-name, format with nixfmt-rfc-style, 0-unstable-2024-02-17 -> 0-unstable-2024-07-26, add ion fury and fix wrappers (#311494)

2024-11-22 06:53:01 +00:00 · 2024-10-21 00:32:49 +02:00 · 2024-10-21 00:32:49 +02:00 · 463b8ced2a
commit 463b8ced2a
parent c8a126a3ef 435828e33c
4 changed files with 195 additions and 160 deletions
--- a/pkgs/by-name/ed/eduke32/convert-bmp-to-png.diff
+++ b/pkgs/by-name/ed/eduke32/convert-bmp-to-png.diff
--- a/pkgs/by-name/ed/eduke32/package.nix
+++ b/pkgs/by-name/ed/eduke32/package.nix
@ -0,0 +1,195 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  makeWrapper,
+  pkg-config,
+  nasm,
+  makeDesktopItem,
+  copyDesktopItems,
+  alsa-lib,
+  flac,
+  gtk2,
+  libvorbis,
+  libvpx,
+  libGL,
+  SDL2,
+  SDL2_mixer,
+  darwin,
+  graphicsmagick,
+}:
+
+let
+  inherit (darwin.apple_sdk.frameworks)
+    AGL
+    Cocoa
+    GLUT
+    OpenGL
+    ;
+  wrapper = "eduke32-wrapper";
+  swWrapper = "voidsw-wrapper";
+  furyWrapper = "fury-wrapper";
+
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "eduke32";
+  version = "0-unstable-2024-07-26";
+
+  src = fetchFromGitLab {
+    domain = "voidpoint.io";
+    owner = "terminx";
+    repo = "eduke32";
+    rev = "19c21b9ab10b0c17147c9ad951cc15279ed33f77";
+    hash = "sha256-lwnx2tVjbHouB0vaT7Dh1Ozea8+7Az6e4Wn6HmxDxCo=";
+  };
+
+  patches = [
+    # gdk-pixbuf-csource no longer supports bmp so convert to png
+    # patch GNUMakefile to use graphicsmagick to convert bmp -> png
+    ./convert-bmp-to-png.diff
+  ];
+
+  buildInputs =
+    [
+      flac
+      libvorbis
+      libvpx
+      SDL2
+      SDL2_mixer
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      alsa-lib
+      gtk2
+      libGL
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      AGL
+      Cocoa
+      GLUT
+      OpenGL
+    ];
+
+  nativeBuildInputs =
+    [
+      makeWrapper
+      pkg-config
+      copyDesktopItems
+      graphicsmagick
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.system == "i686-linux") [
+      nasm
+    ];
+
+  postPatch =
+    ''
+      substituteInPlace source/imgui/src/imgui_impl_sdl2.cpp \
+        --replace-fail '#include <SDL.h>' '#include <SDL2/SDL.h>' \
+        --replace-fail '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \
+        --replace-fail '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>'
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      for f in glad.c glad_wgl.c ; do
+        substituteInPlace source/glad/src/$f \
+          --replace-fail libGL.so ${libGL}/lib/libGL.so
+      done
+    '';
+
+  makeFlags = [
+    "SDLCONFIG=${SDL2}/bin/sdl2-config"
+    # git rev-list --count HEAD
+    "VC_REV=10593"
+    "VC_HASH=${lib.substring 0 9 finalAttrs.src.rev}"
+    "VC_BRANCH=master"
+  ];
+
+  buildFlags = [
+    "duke3d"
+    "sw"
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "eduke32";
+      icon = "eduke32";
+      exec = "${wrapper}";
+      comment = "Duke Nukem 3D port";
+      desktopName = "Enhanced Duke Nukem 3D";
+      genericName = "Duke Nukem 3D port";
+      categories = [ "Game" ];
+    })
+    (makeDesktopItem {
+      name = "voidsw";
+      icon = "voidsw";
+      exec = "${swWrapper}";
+      comment = "Shadow Warrior eduke32 source port";
+      desktopName = "VoidSW";
+      genericName = "Shadow Warrior source port";
+      categories = [ "Game" ];
+    })
+    (makeDesktopItem {
+      name = "fury";
+      icon = "fury";
+      exec = "${furyWrapper}";
+      comment = "Ion Fury eduke32 source port";
+      desktopName = "Ion Fury";
+      genericName = "Ion Fury source port";
+      categories = [ "Game" ];
+    })
+  ];
+
+  enableParallelBuilding = true;
+
+  installPhase =
+    ''
+      runHook preInstall
+
+      install -Dm755 -t $out/bin eduke32 mapster32 voidsw wangulator
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      makeWrapper $out/bin/eduke32 $out/bin/${wrapper} \
+        --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \
+        --add-flags '-j"$EDUKE32_DATA_DIR"' \
+        --add-flags '-gamegrp DUKE3D.GRP'
+      makeWrapper $out/bin/voidsw $out/bin/${swWrapper} \
+        --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \
+        --add-flags '-j"$EDUKE32_DATA_DIR"'
+      makeWrapper $out/bin/eduke32 $out/bin/${furyWrapper} \
+        --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \
+        --add-flags '-j"$EDUKE32_DATA_DIR"' \
+        --add-flags '-gamegrp FURY.GRP'
+      mkdir -p $out/share/icons/hicolor/scalable/apps
+      gm convert "./source/duke3d/rsrc/game_icon.ico[10]" $out/share/icons/hicolor/scalable/apps/eduke32.png
+      install -Dm644 ./source/sw/rsrc/game_icon.svg $out/share/icons/hicolor/scalable/apps/voidsw.svg
+      gm convert "./source/duke3d/rsrc/fury/game_icon.ico[4]" $out/share/icons/hicolor/scalable/apps/fury.png
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/Applications/EDuke32.app/Contents/MacOS
+      mkdir -p $out/Applications/Mapster32.app/Contents/MacOS
+      mkdir -p $out/Applications/VoidSW.app/Contents/MacOS
+      mkdir -p $out/Applications/Wangulator.app/Contents/MacOS
+
+      cp -r platform/Apple/bundles/EDuke32.app/* $out/Applications/EDuke32.app/
+      cp -r platform/Apple/bundles/Mapster32.app/* $out/Applications/Mapster32.app/
+      cp -r platform/Apple/bundles/VoidSW.app/* $out/Applications/VoidSW.app/
+      cp -r platform/Apple/bundles/Wangulator.app/* $out/Applications/Wangulator.app/
+
+      ln -sf $out/bin/eduke32 $out/Applications/EDuke32.app/Contents/MacOS/eduke32
+      ln -sf $out/bin/mapster32 $out/Applications/Mapster32.app/Contents/MacOS/mapster32
+      ln -sf $out/bin/voidsw $out/Applications/VoidSW.app/Contents/MacOS/voidsw
+      ln -sf $out/bin/wangulator $out/Applications/Wangulator.app/Contents/MacOS/wangulator
+    ''
+    + ''
+      runHook postInstall
+    '';
+
+  meta = {
+    description = "Enhanched port of Duke Nukem 3D for various platforms";
+    homepage = "http://eduke32.com";
+    license = with lib.licenses; [ gpl2Plus ];
+    maintainers = with lib.maintainers; [
+      qubitnano
+      sander
+    ];
+    platforms = lib.platforms.all;
+  };
+})
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@ -1,156 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, makeWrapper
-, pkg-config
-, nasm
-, makeDesktopItem
-, copyDesktopItems
-, alsa-lib
-, flac
-, gtk2
-, libvorbis
-, libvpx
-, libGL
-, SDL2
-, SDL2_mixer
-, AGL
-, Cocoa
-, GLUT
-, OpenGL
-, graphicsmagick
-}:
-
-let
-  wrapper = "eduke32-wrapper";
-  swWrapper = "voidsw-wrapper";
-
-in stdenv.mkDerivation (finalAttrs: {
-  pname = "eduke32";
-  version = "0-unstable-2024-02-17";
-
-  src = fetchFromGitLab {
-    domain = "voidpoint.io";
-    owner = "terminx";
-    repo = "eduke32";
-    rev = "8afa42e388e0434b38979fdddc763363717a2727";
-    hash = "sha256-dyZ4JtDBxsTDe9uQDWxJe7M74X7m+5wpEHm+i+s9hwo=";
-  };
-
-  patches = [
-    # gdk-pixbuf-csource no longer supports bmp so convert to png
-    # patch GNUMakefile to use graphicsmagick to convert bmp -> png
-    ./convert-bmp-to-png.diff
-  ];
-
-  buildInputs = [
-    flac
-    libvorbis
-    libvpx
-    SDL2
-    SDL2_mixer
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    alsa-lib
-    gtk2
-    libGL
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    AGL
-    Cocoa
-    GLUT
-    OpenGL
-  ];
-
-  nativeBuildInputs = [
-    makeWrapper
-    pkg-config
-    copyDesktopItems
-    graphicsmagick
-  ] ++ lib.optionals (stdenv.hostPlatform.system == "i686-linux") [
-    nasm
-  ];
-
-  postPatch = ''
-    substituteInPlace source/imgui/src/imgui_impl_sdl2.cpp \
-      --replace-fail '#include <SDL.h>' '#include <SDL2/SDL.h>' \
-      --replace-fail '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \
-      --replace-fail '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>'
-  '' + lib.optionalString stdenv.hostPlatform.isLinux ''
-    for f in glad.c glad_wgl.c ; do
-      substituteInPlace source/glad/src/$f \
-        --replace-fail libGL.so ${libGL}/lib/libGL.so
-    done
-  '';
-
-  makeFlags = [
-    "SDLCONFIG=${SDL2}/bin/sdl2-config"
-  ];
-
-  buildFlags = [
-    "duke3d"
-    "sw"
-  ];
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "eduke32";
-      icon = "eduke32";
-      exec = "${wrapper}";
-      comment = "Duke Nukem 3D port";
-      desktopName = "Enhanced Duke Nukem 3D";
-      genericName = "Duke Nukem 3D port";
-      categories = [ "Game" ];
-    })
-    (makeDesktopItem {
-      name = "voidsw";
-      icon = "voidsw";
-      exec = "${swWrapper}";
-      comment = "Shadow Warrior eduke32 source port";
-      desktopName = "VoidSW";
-      genericName = "Shadow Warrior source port";
-      categories = [ "Game" ];
-    })
-  ];
-
-  enableParallelBuilding = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 -t $out/bin eduke32 mapster32 voidsw wangulator
-  '' + lib.optionalString stdenv.hostPlatform.isLinux ''
-    makeWrapper $out/bin/eduke32 $out/bin/${wrapper} \
-      --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \
-      --add-flags '-g "$EDUKE32_DATA_DIR/DUKE3D.GRP"'
-    makeWrapper $out/bin/voidsw $out/bin/${swWrapper} \
-      --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \
-      --add-flags '-g"$EDUKE32_DATA_DIR/SW.GRP"'
-    mkdir -p $out/share/icons/hicolor/scalable/apps
-    gm convert "./source/duke3d/rsrc/game_icon.ico[10]" $out/share/icons/hicolor/scalable/apps/eduke32.png
-    install -Dm644 ./source/sw/rsrc/game_icon.svg $out/share/icons/hicolor/scalable/apps/voidsw.svg
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir -p $out/Applications/EDuke32.app/Contents/MacOS
-    mkdir -p $out/Applications/Mapster32.app/Contents/MacOS
-    mkdir -p $out/Applications/VoidSW.app/Contents/MacOS
-    mkdir -p $out/Applications/Wangulator.app/Contents/MacOS
-
-    cp -r platform/Apple/bundles/EDuke32.app/* $out/Applications/EDuke32.app/
-    cp -r platform/Apple/bundles/Mapster32.app/* $out/Applications/Mapster32.app/
-    cp -r platform/Apple/bundles/VoidSW.app/* $out/Applications/VoidSW.app/
-    cp -r platform/Apple/bundles/Wangulator.app/* $out/Applications/Wangulator.app/
-
-    ln -sf $out/bin/eduke32 $out/Applications/EDuke32.app/Contents/MacOS/eduke32
-    ln -sf $out/bin/mapster32 $out/Applications/Mapster32.app/Contents/MacOS/mapster32
-    ln -sf $out/bin/voidsw $out/Applications/VoidSW.app/Contents/MacOS/voidsw
-    ln -sf $out/bin/wangulator $out/Applications/Wangulator.app/Contents/MacOS/wangulator
-  '' + ''
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Enhanched port of Duke Nukem 3D for various platforms";
-    homepage = "http://eduke32.com";
-    license = with lib.licenses; [ gpl2Plus ];
-    maintainers = with lib.maintainers; [ mikroskeem sander ];
-    platforms = lib.platforms.all;
-  };
-})
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -34520,10 +34520,6 @@ with pkgs;

  ecwolf = callPackage ../games/ecwolf { };

-  eduke32 = callPackage ../games/eduke32 {
-    inherit (darwin.apple_sdk.frameworks) AGL Cocoa GLUT OpenGL;
-  };
-
  egoboo = callPackage ../games/egoboo { };

  eidolon = callPackage ../games/eidolon { };