mirror of
https://github.com/pimalaya/himalaya.git
synced 2024-12-09 21:18:39 +03:00
remove wine dep from build
This commit is contained in:
@@ -57,7 +57,7 @@ himalaya.overrideAttrs (drv: {
|
||||
# NOTE: manual wineprefix update is somehow needed:
|
||||
# <https://github.com/NixOS/nixpkgs/issues/321332>
|
||||
postInstall = (drv.postInstall or "") + lib.optionalString hostPlatform.isWindows ''
|
||||
${lib.getExe' wine "wineboot"} --init
|
||||
export WINEPREFIX="$(${lib.getExe mktemp} -d)"
|
||||
'' + ''
|
||||
mkdir -p $out/bin/share/{applications,completions,man,services}
|
||||
cp assets/himalaya.desktop $out/bin/share/applications/
|
||||
|
||||
@@ -84,12 +84,16 @@
|
||||
mkCrossApp = system: crossConfig:
|
||||
let
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
mktemp = "${lib.getExe pkgs.mktemp} -d";
|
||||
emulator = crossPkgs.hostPlatform.emulator pkgs;
|
||||
crossSystem = { config = crossConfig; isStatic = true; };
|
||||
crossPkgs = import nixpkgs { inherit system crossSystem; };
|
||||
crossPkgName = "cross-${crossPkgs.hostPlatform.system}";
|
||||
crossPkgExe = lib.getExe self.packages.${system}.${crossPkgName};
|
||||
program = lib.getExe (pkgs.writeShellScriptBin "himalaya" "${emulator} ${crossPkgExe} $@");
|
||||
program = lib.getExe (pkgs.writeShellScriptBin "himalaya" ''
|
||||
${lib.optionalString crossPkgs.hostPlatform.isWindows "export WINEPREFIX=$(${mktemp})"}
|
||||
${emulator} ${crossPkgExe} $@
|
||||
'');
|
||||
in
|
||||
{ "${crossPkgName}" = { inherit program; type = "app"; }; };
|
||||
in
|
||||
|
||||
Reference in New Issue
Block a user