winbox: refactor, fix broken build, 3.40 -> 3.41

pkgs/tools/admin/winbox/default.nix

@@ -1,73 +1,77 @@
-{ lib
+{
-, fetchurl
+  lib,
-, makeDesktopItem
+  stdenvNoCC,
-, symlinkJoin
+  fetchurl,
-, writeShellScriptBin
+  copyDesktopItems,
-, wine
+  makeDesktopItem,
+  makeBinaryWrapper,
+  wine,
 }:
 
 let
-  inherit (lib) last splitString;
-
-  pname = "winbox";
-  version = "3.40";
-  name = "${pname}-${version}";
-
-  executable = fetchurl (if (wine.meta.mainProgram == "wine64") then {
-    url = "https://download.mikrotik.com/routeros/winbox/${version}/winbox64.exe";
-    sha256 = "1dxny1qmq4pmdn40j9zk461p3qwwjin5d18ajhczrnqrcr2v1xwi";
-  } else {
-    url = "https://download.mikrotik.com/routeros/winbox/${version}/winbox.exe";
-    sha256 = "11vmdkwi38y7wkdkgsqpfs4l2bdaj9yg6c8wlgfzp91227gjn5li";
-  });
-
-  # This is from the winbox AUR package:
-  # https://aur.archlinux.org/cgit/aur.git/tree/winbox64?h=winbox64&id=8edd93792af84e87592e8645ca09e9795931e60e
-  wrapper = writeShellScriptBin pname ''
-    export WINEPREFIX="''${WINBOX_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/winbox"}/wine"
-    export WINEDLLOVERRIDES="mscoree=" # disable mono
-    export WINEDEBUG=-all
-    if [ ! -d "$WINEPREFIX" ] ; then
-      mkdir -p "$WINEPREFIX"
-      ${wine}/bin/wineboot -u
-    fi
-
-    ${wine}/bin/${wine.meta.mainProgram} ${executable} "$@"
-  '';
-
-  desktopItem = makeDesktopItem {
-    name = pname;
-    desktopName = "Winbox";
-    comment = "GUI administration for Mikrotik RouterOS";
-    exec = pname;
-    icon = pname;
-    categories = [ "Utility" ];
-    startupWMClass = last (splitString "/" executable);
-  };
-
   # The icon is also from the winbox AUR package (see above).
   icon = fetchurl {
     name = "winbox.png";
     url = "https://aur.archlinux.org/cgit/aur.git/plain/winbox.png?h=winbox";
-    sha256 = "sha256-YD6u2N+1thRnEsXO6AHm138fRda9XEtUX5+EGTg004A=";
+    hash = "sha256-YD6u2N+1thRnEsXO6AHm138fRda9XEtUX5+EGTg004A=";
   };
 in
-symlinkJoin {
+stdenvNoCC.mkDerivation (finalAttrs: {
-  inherit name pname version;
+  pname = "winbox";
-  paths = [ wrapper desktopItem ];
+  version = "3.41";
 
-  postBuild = ''
+  src = fetchurl (
-    mkdir -p "$out/share/pixmaps"
+    if (wine.meta.mainProgram == "wine64") then
-    ln -s "${icon}" "$out/share/pixmaps/${pname}.png"
+      {
+        url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/winbox64.exe";
+        hash = "sha256-i8Ps8fNZUmAOyxo4DDjIjp1jwIGjIgT9CU1YgjAHC/Y=";
+      }
+    else
+      {
+        url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/winbox.exe";
+        hash = "sha256-NypSEC5YKpqldlkSIRFtWVD4xJZcjGcfjnphSg70wmE=";
+      }
+  );
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    copyDesktopItems
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,libexec,share/pixmaps}
+
+    ln -s "${icon}" "$out/share/pixmaps/winbox.png"
+
+    makeWrapper ${lib.getExe wine} $out/bin/winbox \
+      --add-flags $src
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  desktopItems = [
+    (makeDesktopItem {
+      name = "winbox";
+      desktopName = "Winbox";
+      comment = "GUI administration for Mikrotik RouterOS";
+      exec = "winbox";
+      icon = "winbox";
+      categories = [ "Utility" ];
+    })
+  ];
+
+  meta = {
     description = "Graphical configuration utility for RouterOS-based devices";
     homepage = "https://mikrotik.com";
     downloadPage = "https://mikrotik.com/download";
     changelog = "https://wiki.mikrotik.com/wiki/Winbox_changelog";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
+    license = lib.licenses.unfree;
-    maintainers = with maintainers; [ yrd ];
+    mainProgram = "winbox";
+    maintainers = with lib.maintainers; [ yrd ];
   };
-}
+})