winbox: fix startup of the application
This commit is contained in:
parent
7eee363dcb
commit
5a166bbbc3
|
@ -5,9 +5,7 @@
|
|||
, makeWrapper
|
||||
, symlinkJoin
|
||||
, writeShellScriptBin
|
||||
|
||||
, wine
|
||||
, use64 ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -17,18 +15,18 @@ let
|
|||
version = "3.37";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
executable = fetchurl (if use64 then {
|
||||
executable = fetchurl (if (wine.meta.mainProgram == "wine64") then {
|
||||
url = "https://download.mikrotik.com/winbox/${version}/winbox64.exe";
|
||||
sha256 = "0fbl0i5ga9afg8mklm9xqidcr388sca00slj401npwh9b3j9drmb";
|
||||
} else {
|
||||
url = "https://download.mikrotik.com/winbox/${version}/winbox.exe";
|
||||
sha256 = "1zla30bc755x5gfv9ff1bgjvpsjmg2d7jsjxnwwy679fry4n4cwl";
|
||||
});
|
||||
|
||||
# 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 WINEARCH=${if use64 then "win64" else "win32"}
|
||||
export WINEDLLOVERRIDES="mscoree=" # disable mono
|
||||
export WINEDEBUG=-all
|
||||
if [ ! -d "$WINEPREFIX" ] ; then
|
||||
|
@ -36,7 +34,7 @@ let
|
|||
${wine}/bin/wineboot -u
|
||||
fi
|
||||
|
||||
${wine}/bin/wine ${executable} "$@"
|
||||
${wine}/bin/${wine.meta.mainProgram} ${executable} "$@"
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
|
|
@ -1478,7 +1478,6 @@ with pkgs;
|
|||
|
||||
winbox = callPackage ../tools/admin/winbox {
|
||||
wine = wineWowPackages.staging;
|
||||
use64 = true;
|
||||
};
|
||||
|
||||
wwcd = callPackage ../tools/misc/wwcd { };
|
||||
|
|
Loading…
Reference in a new issue