diff --git a/packages/winapps-launcher/WinApps-Launcher.patch b/packages/winapps-launcher/WinApps-Launcher.patch index d6ced4d..41b0b2d 100644 --- a/packages/winapps-launcher/WinApps-Launcher.patch +++ b/packages/winapps-launcher/WinApps-Launcher.patch @@ -1,11 +1,13 @@ +diff --git a/WinApps-Launcher.sh b/WinApps-Launcher.sh +index 1d3a929..a5d7d4c 100755 --- a/WinApps-Launcher.sh +++ b/WinApps-Launcher.sh @@ -19,7 +19,7 @@ declare -rx EC_WIN_NOT_SPEC=6 declare -rx EC_NO_WIN_FOUND=7 - + # Paths -declare -rx ICONS_PATH="./Icons" +declare -rx ICONS_PATH="@out@/Icons" - declare -rx APPDATA_PATH="${HOME}/.local/share/winapps" - declare -rx CONFIG_PATH="${HOME}/.config/winapps" + declare -rx APPDATA_PATH="${XDG_DATA_HOME:-$HOME/.local/share}/winapps" + declare -rx CONFIG_PATH="${XDG_CONFIG_HOME:-$HOME/.config}/winapps" declare -rx CONFIG_FILE="${CONFIG_PATH}/winapps.conf" diff --git a/packages/winapps-launcher/default.nix b/packages/winapps-launcher/default.nix index c353a86..328483c 100644 --- a/packages/winapps-launcher/default.nix +++ b/packages/winapps-launcher/default.nix @@ -9,12 +9,12 @@ ... }: let - rev = "9b3f6c581791222a3a04508606755d6d0519f322"; - hash = "sha256-Hy/o5IY9HmTWaX54Ek5ABmppPpzgM+MdCrhzEzVmtwY="; + rev = "87f92a80c7e421ab7d1b8801e647dcbfaaa6ee34"; + hash = "sha256-aZ8uusg5yQOD1xYfaX2IQCbcPdHuVA0tiy1NDkdGCCs="; in stdenv.mkDerivation rec { pname = "winapps-launcher"; - version = "0-unstable-2025-03-11"; + version = "0-unstable-2025-09-01"; src = fetchFromGitHub { owner = "winapps-org"; diff --git a/packages/winapps/setup.patch b/packages/winapps/setup.patch index 61b13d7..4990741 100644 --- a/packages/winapps/setup.patch +++ b/packages/winapps/setup.patch @@ -1,5 +1,5 @@ diff --git a/setup.sh b/setup.sh -index d514bcc..ff53ead 100755 +index 3a871c8..71a8fa0 100755 --- a/setup.sh +++ b/setup.sh @@ -39,8 +39,8 @@ readonly SYS_BIN_PATH="/usr/local/bin" # UNIX path to 'bin' dir @@ -68,7 +68,7 @@ index d514bcc..ff53ead 100755 # Complete the previous line. echo -e "${FAIL_TEXT}Failed!${CLEAR_TEXT}\n" -@@ -1242,11 +1222,11 @@ function waConfigureWindows() { +@@ -1239,11 +1219,11 @@ function waConfigureWindows() { # Populate variables. WIN_BASH="\ #!/usr/bin/env bash @@ -82,7 +82,7 @@ index d514bcc..ff53ead 100755 Terminal=false Type=Application Icon=${APPDATA_PATH}/icons/windows.svg -@@ -1293,13 +1273,13 @@ function waConfigureApp() { +@@ -1290,13 +1270,13 @@ function waConfigureApp() { # Determine the content of the bash script for the application. APP_BASH="\ #!/usr/bin/env bash @@ -98,16 +98,17 @@ index d514bcc..ff53ead 100755 Terminal=false Type=Application Icon=${APP_ICON} -@@ -1349,6 +1329,8 @@ function waConfigureOfficiallySupported() { +@@ -1364,7 +1344,9 @@ function waConfigureOfficiallySupported() { fi # Copy the protocol handler to the appropriate directory. + # Fix permissions for nix. -+ $SUDO chmod u+w "$TARGET_DIR/ms-office-protocol-handler.desktop" $SUDO cp "./apps/ms-office-protocol-handler.desktop" "$TARGET_DIR/ms-office-protocol-handler.desktop" ++ $SUDO chmod u+w "$TARGET_DIR/ms-office-protocol-handler.desktop" fi -@@ -1566,7 +1548,7 @@ function waInstall() { + # Print feedback. +@@ -1596,7 +1578,7 @@ function waInstall() { echo -e "${BOLD_TEXT}Installing WinApps.${CLEAR_TEXT}" # Check for existing conflicting WinApps installations. @@ -116,21 +117,19 @@ index d514bcc..ff53ead 100755 # Load the WinApps configuration file. waLoadConfig -@@ -1635,8 +1617,11 @@ function waInstall() { +@@ -1664,9 +1646,8 @@ function waInstall() { + # Check for installed applications. waFindInstalled - # Install the WinApps bash scripts. +- # Install the WinApps bash scripts. - $SUDO ln -sf "${SOURCE_PATH}/bin/winapps" "${BIN_PATH}/winapps" - $SUDO ln -sf "${SOURCE_PATH}/setup.sh" "${BIN_PATH}/winapps-setup" -+ -+ -+ + # Fix permissions for nix. + $SUDO chmod u+w -R "${APPDATA_PATH}" # Configure the Windows RDP session application launcher. waConfigureWindows -@@ -1697,18 +1682,15 @@ function waUninstall() { +@@ -1727,18 +1708,15 @@ function waUninstall() { local DESKTOP_FILE_NAME="" # Stores the name of the '.desktop' file for the application. local BASH_SCRIPT_NAME="" # Stores the name of the application. @@ -151,7 +150,7 @@ index d514bcc..ff53ead 100755 # Remove each '.desktop' file. for DESKTOP_FILE_PATH in "${WINAPPS_DESKTOP_FILES[@]}"; do -@@ -1729,7 +1711,7 @@ function waUninstall() { +@@ -1759,7 +1737,7 @@ function waUninstall() { done # Store the paths of bash scripts calling 'WinApps' to launch specific applications in an array, returning an empty array if no such files exist. @@ -160,7 +159,7 @@ index d514bcc..ff53ead 100755 # Remove each bash script. for BASH_SCRIPT_PATH in "${WINAPPS_APP_BASH_SCRIPTS[@]}"; do -@@ -1750,10 +1732,9 @@ function waUninstall() { +@@ -1780,10 +1758,9 @@ function waUninstall() { done # Print caveats.