diff --git a/packaging/nix/0-Makefile-no-vendor.patch b/packaging/nix/0-Makefile-no-vendor.patch deleted file mode 100644 index 852752e7..00000000 --- a/packaging/nix/0-Makefile-no-vendor.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 9324abc..a293409 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -21,7 +21,7 @@ FLATPAK ?= xfalse - - .PHONY: all - ifeq ($(FLATPAK), xtrue) --all: umu-dist umu-launcher umu-vendored -+all: umu-dist umu-launcher - endif - - .PHONY: install -@@ -30,8 +30,8 @@ SOURCE_DATE_EPOCH = $(shell LC_ALL=C date --date='@1580601600') - all: zipapp - install: zipapp-install - else --all: umu-dist umu-docs umu-launcher umu-vendored --install: umu-install umu-launcher-install umu-vendored-install -+all: umu-dist umu-docs umu-launcher -+install: umu-install umu-launcher-install - endif - - diff --git a/packaging/nix/unwrapped.nix b/packaging/nix/unwrapped.nix index e4526628..f04f58b6 100644 --- a/packaging/nix/unwrapped.nix +++ b/packaging/nix/unwrapped.nix @@ -20,13 +20,28 @@ umu-launcher-unwrapped.overridePythonAttrs (prev: { # https://github.com/Open-Wine-Components/umu-launcher/pull/289 # - The other is backporting: # https://github.com/Open-Wine-Components/umu-launcher/pull/343 - patches = [ - # Remove `umu-vendored` from the `all` target - # This causes an error when building vendored dependencies: - # python3 -m pip install urllib3 -t builddir - # => No module named pip - ./0-Makefile-no-vendor.patch - ]; + patches = []; + + # The `umu-vendored` target needs submodules. However, we don't actually need + # this target or those submodules anyway, since we add `pyzstd` as a nix package + # + # As a temporary solution, we explicitly specify the supported build targets: + buildFlags = + (prev.buildFlags or []) + ++ [ + "umu-dist" + "umu-launcher" + ]; + + # Same issue for install targets + installTargets = + (prev.installTargets or []) + ++ [ + "umu-dist" + "umu-docs" + "umu-launcher" + "umu-delta" + ]; nativeBuildInputs = (prev.nativeBuildInputs or [])