Merge pull request #326400 from qubitnano/2ship102

_2ship2harkinian: 1.0.1 -> 1.0.2, reorganize

pkgs/by-name/_2/_2ship2harkinian/package.nix

···
 {
+  lib,
   stdenv,
+  SDL2,
   cmake,
-  lsb-release,
-  ninja,
-  lib,
+  copyDesktopItems,
   fetchFromGitHub,
+  fetchpatch,
   fetchurl,
-  copyDesktopItems,
-  makeDesktopItem,
-  python3,
-  SDL2,
-  pkg-config,
-  libpulseaudio,
-  libpng,
   imagemagick,
-  zenity,
-  makeWrapper,
   imgui,
-  stormlib,
+  libpng,
+  libpulseaudio,
   libzip,
+  lsb-release,
+  makeDesktopItem,
+  makeWrapper,
+  ninja,
   nlohmann_json,
+  pkg-config,
+  python3,
+  spdlog,
+  stormlib,
   tinyxml-2,
-  spdlog,
-  fetchpatch,
   writeTextFile,
+  zenity,
 }:
 
 let
 
+  # This would get fetched at build time otherwise, see:
+  # https://github.com/HarbourMasters/2ship2harkinian/blob/1.0.2/mm/CMakeLists.txt#L708
+  gamecontrollerdb = fetchurl {
+    name = "gamecontrollerdb.txt";
+    url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/b1759cf84028aab89caa1c395e198c340b8dfd89/gamecontrollerdb.txt";
+    hash = "sha256-7C5EkqBIhLGNJuhi3832y0ffW5Ep7iuTYXb1bL5h2Js=";
+  };
+
   # 2ship needs a specific imgui version
   imgui' = imgui.overrideAttrs rec {
     version = "1.90.6";
···
     };
   };
 
+  libgfxd = fetchFromGitHub {
+    owner = "glankk";
+    repo = "libgfxd";
+    rev = "008f73dca8ebc9151b205959b17773a19c5bd0da";
+    hash = "sha256-AmHAa3/cQdh7KAMFOtz5TQpcM6FqO9SppmDpKPTjTt8=";
+  };
+
+  stb_impl = writeTextFile {
+    name = "stb_impl.c";
+    text = ''
+      #define STB_IMAGE_IMPLEMENTATION
+      #include "stb_image.h"
+    '';
+  };
+
+  stb' = fetchurl {
+    name = "stb_image.h";
+    url = "https://raw.githubusercontent.com/nothings/stb/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h";
+    hash = "sha256-xUsVponmofMsdeLsI6+kQuPg436JS3PBl00IZ5sg3Vw=";
+  };
+
   # Apply 2ship's patch for stormlib
   stormlib' = stormlib.overrideAttrs (prev: rec {
     version = "9.25";
···
     ];
   });
 
-  # This would get fetched at build time otherwise, see:
-  # https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/soh/CMakeLists.txt#L736
-  gamecontrollerdb = fetchurl {
-    name = "gamecontrollerdb.txt";
-    url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/30cb02c07001234f021eadf64035ef07753c1263/gamecontrollerdb.txt";
-    hash = "sha256-Q/OUrvoLY4fF/EJBmQC57y5b3D0Rmlyd9zAmB7U8SUU=";
-  };
-
   thread_pool = fetchFromGitHub {
     owner = "bshoshany";
     repo = "thread-pool";
···
     hash = "sha256-zhRFEmPYNFLqQCfvdAaG5VBNle9Qm8FepIIIrT9sh88=";
   };
 
-  libgfxd = fetchFromGitHub {
-    owner = "glankk";
-    repo = "libgfxd";
-    rev = "008f73dca8ebc9151b205959b17773a19c5bd0da";
-    hash = "sha256-AmHAa3/cQdh7KAMFOtz5TQpcM6FqO9SppmDpKPTjTt8=";
-  };
-
-  stb_impl = writeTextFile {
-    name = "stb_impl.c";
-    text = ''
-      #define STB_IMAGE_IMPLEMENTATION
-      #include "stb_image.h"
-    '';
-  };
-
-  stb' = fetchurl {
-    name = "stb_image.h";
-    url = "https://raw.githubusercontent.com/nothings/stb/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h";
-    hash = "sha256-xUsVponmofMsdeLsI6+kQuPg436JS3PBl00IZ5sg3Vw=";
-  };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "2ship2harkinian";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "HarbourMasters";
     repo = "2ship2harkinian";
-    rev = finalAttrs.version;
-    hash = "sha256-czPAmqlXfhOjOYYssDuKt2YDlMlkruNx8EDXo1ksb14=";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-1iSFzroKxwFpsIGNMetSlQKTKRWCy7QtgCTepFdSeY8=";
     fetchSubmodules = true;
   };
 
+  patches = [
+    # remove fetching stb as we will patch our own
+    ./0001-deps.patch
+  ];
+
   nativeBuildInputs = [
     cmake
+    copyDesktopItems
+    imagemagick
+    lsb-release
+    makeWrapper
     ninja
     pkg-config
-    lsb-release
     python3
-    imagemagick
-    copyDesktopItems
-    makeWrapper
   ];
 
   buildInputs = [
     SDL2
-    libpulseaudio
+    imgui'
     libpng
-    zenity
-    imgui'
-    stormlib'
+    libpulseaudio
     libzip
     nlohmann_json
-    tinyxml-2
     spdlog
+    stormlib'
+    tinyxml-2
+    zenity
   ];
 
   cmakeFlags = [
-    "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/2s2h"
-    "-DFETCHCONTENT_SOURCE_DIR_IMGUI=${imgui'.src}"
-    "-DFETCHCONTENT_SOURCE_DIR_STORMLIB=${stormlib'}"
-    "-DFETCHCONTENT_SOURCE_DIR_LIBGFXD=${libgfxd}"
-    "-DFETCHCONTENT_SOURCE_DIR_THREADPOOL=${thread_pool}"
+    (lib.cmakeBool "NON_PORTABLE" true)
     (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
-    (lib.cmakeBool "NON_PORTABLE" true)
+    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/2s2h")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'.src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}")
   ];
 
   dontAddPrefix = true;
···
       --replace-fail "\''${STB_DIR}" "/build/source/stb"
   '';
 
-  patches = [
-    # remove fetching stb as we will patch our own
-    ./0001-deps.patch
-  ];
-
   postBuild = ''
     cp ${gamecontrollerdb} ${gamecontrollerdb.name}
     pushd ../OTRExporter
···
     install -Dm644 ../mm/linux/2s2hIcon.png $out/share/pixmaps/2s2h.png
   '';
 
-  fixupPhase = ''
+  postFixup = ''
     wrapProgram $out/2s2h/2s2h.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]}
   '';