diff --git a/packaging/nix/0-Makefile-no-vendor.patch b/packaging/nix/0-Makefile-no-vendor.patch new file mode 100644 index 00000000..852752e7 --- /dev/null +++ b/packaging/nix/0-Makefile-no-vendor.patch @@ -0,0 +1,24 @@ +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/umu-launcher.nix b/packaging/nix/umu-launcher.nix index fe063560..eb43bd52 100644 --- a/packaging/nix/umu-launcher.nix +++ b/packaging/nix/umu-launcher.nix @@ -3,6 +3,7 @@ python3Packages.buildPythonPackage { pname = "umu-launcher"; version = "${version}"; src = umu-launcher; + patches = [ ./0-Makefile-no-vendor.patch ]; pyproject = false; depsBuildBuild = [ pkgs.meson @@ -18,6 +19,7 @@ python3Packages.buildPythonPackage { pkgs.bubblewrap pkgs.python3Packages.xlib pkgs.python3Packages.filelock + pkgs.python3Packages.urllib3 ]; makeFlags = [ "PYTHON_INTERPRETER=${pyth1}/bin/python" "SHELL_INTERPRETER=/run/current-system/sw/bin/bash" "DESTDIR=${placeholder "out"}" ]; dontUseMesonConfigure = true;