b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

winbox: fix startup of the application

Browse source
This commit is contained in:
Pol Dellaiera 2022-11-23 14:22:53 +01:00
parent 7eee363dcb
commit 5a166bbbc3
No known key found for this signature in database
GPG key ID: D476DFE9C67467CA
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/admin/winbox/default.nix
View file

@ -5,9 +5,7 @@
, makeWrapper , makeWrapper
, symlinkJoin , symlinkJoin
, writeShellScriptBin , writeShellScriptBin
, wine , wine
, use64 ? false
}: }:
let let
@ -17,18 +15,18 @@ let
version = "3.37"; version = "3.37";
name = "${pname}-${version}"; 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"; url = "https://download.mikrotik.com/winbox/${version}/winbox64.exe";
sha256 = "0fbl0i5ga9afg8mklm9xqidcr388sca00slj401npwh9b3j9drmb"; sha256 = "0fbl0i5ga9afg8mklm9xqidcr388sca00slj401npwh9b3j9drmb";
} else { } else {
url = "https://download.mikrotik.com/winbox/${version}/winbox.exe"; url = "https://download.mikrotik.com/winbox/${version}/winbox.exe";
sha256 = "1zla30bc755x5gfv9ff1bgjvpsjmg2d7jsjxnwwy679fry4n4cwl"; sha256 = "1zla30bc755x5gfv9ff1bgjvpsjmg2d7jsjxnwwy679fry4n4cwl";
}); });
# This is from the winbox AUR package: # This is from the winbox AUR package:
# https://aur.archlinux.org/cgit/aur.git/tree/winbox64?h=winbox64&id=8edd93792af84e87592e8645ca09e9795931e60e # https://aur.archlinux.org/cgit/aur.git/tree/winbox64?h=winbox64&id=8edd93792af84e87592e8645ca09e9795931e60e
wrapper = writeShellScriptBin pname '' wrapper = writeShellScriptBin pname ''
export WINEPREFIX="''${WINBOX_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/winbox"}/wine" 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 WINEDLLOVERRIDES="mscoree=" # disable mono
export WINEDEBUG=-all export WINEDEBUG=-all
if [ ! -d "$WINEPREFIX" ] ; then if [ ! -d "$WINEPREFIX" ] ; then
@ -36,7 +34,7 @@ let
${wine}/bin/wineboot -u ${wine}/bin/wineboot -u
fi fi
${wine}/bin/wine ${executable} "$@" ${wine}/bin/${wine.meta.mainProgram} ${executable} "$@"
''; '';
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {

1
pkgs/top-level/all-packages.nix
View file

@ -1478,7 +1478,6 @@ with pkgs;
winbox = callPackage ../tools/admin/winbox { winbox = callPackage ../tools/admin/winbox {
wine = wineWowPackages.staging; wine = wineWowPackages.staging;
use64 = true;
}; };
wwcd = callPackage ../tools/misc/wwcd { }; wwcd = callPackage ../tools/misc/wwcd { };