diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e42bd3d..2782a5f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,8 +66,6 @@ jobs: - name: Build yandexmusic run: nix build --impure .#yandexmusic - - name: Build yandexmusic background - run: nix build --impure .#yandexmusic-background - name: Build yandexmusic without flakes binaries run: nix build --impure .#yandexmusic-noflakes diff --git a/flake.nix b/flake.nix index fd2e181..543bec8 100644 --- a/flake.nix +++ b/flake.nix @@ -18,9 +18,6 @@ { packages = rec { yandexmusic = yandexmusic-with pkgs; - yandexmusic-background = yandexmusic.override { - fixQuit = false; - }; yandexmusic-noflakes = pkgs.callPackage ./nix {}; generate_packages = pkgs.callPackage ./nix/generate_packages.nix {}; default = yandexmusic; diff --git a/nix/default.nix b/nix/default.nix index 4e3c29b..1e8c17f 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -10,7 +10,6 @@ , electron , ymExe ? null -, fixQuit ? true }: let version_info = with builtins; fromJSON (readFile ../utility/version_info.json); @@ -45,7 +44,7 @@ stdenvNoCC.mkDerivation cp -r $repack ./repack.sh cp -r $patches ./patches cp -r $utility ./utility - bash "./repack.sh" ${if !fixQuit then "-q" else ""} -o "./app" "$src" + bash "./repack.sh" -o "./app" "$src" ''; dontPatch = true; diff --git a/repack.sh b/repack.sh index 91252cc..ff8c9c7 100755 --- a/repack.sh +++ b/repack.sh @@ -8,19 +8,16 @@ usage() { echo " Options:" echo " -o DIR Path to destination folder" echo " -x Extract and fix only to destination folder" - echo " -q Do not apply application quit fix" echo " -h Show this help and exit" } exe_location= dst="$PWD/app" SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -patch_fix_quit=1 -while getopts :xo:qh name; do +while getopts :xo:h name; do case $name in x) extract_only=1 ;; o) dst="$OPTARG" ;; - q) patch_fix_quit=0 ;; h) usage exit 0