Skip to content

Commit e559e2e

Browse files
authored
Patch makefile to not vendor on nix (#297)
1 parent 3277b47 commit e559e2e

File tree

2 files changed

+26
-0
lines changed

2 files changed

+26
-0
lines changed
+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/Makefile.in b/Makefile.in
2+
index 9324abc..a293409 100644
3+
--- a/Makefile.in
4+
+++ b/Makefile.in
5+
@@ -21,7 +21,7 @@ FLATPAK ?= xfalse
6+
7+
.PHONY: all
8+
ifeq ($(FLATPAK), xtrue)
9+
-all: umu-dist umu-launcher umu-vendored
10+
+all: umu-dist umu-launcher
11+
endif
12+
13+
.PHONY: install
14+
@@ -30,8 +30,8 @@ SOURCE_DATE_EPOCH = $(shell LC_ALL=C date --date='@1580601600')
15+
all: zipapp
16+
install: zipapp-install
17+
else
18+
-all: umu-dist umu-docs umu-launcher umu-vendored
19+
-install: umu-install umu-launcher-install umu-vendored-install
20+
+all: umu-dist umu-docs umu-launcher
21+
+install: umu-install umu-launcher-install
22+
endif
23+
24+

packaging/nix/umu-launcher.nix

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ python3Packages.buildPythonPackage {
33
pname = "umu-launcher";
44
version = "${version}";
55
src = umu-launcher;
6+
patches = [ ./0-Makefile-no-vendor.patch ];
67
pyproject = false;
78
depsBuildBuild = [
89
pkgs.meson
@@ -18,6 +19,7 @@ python3Packages.buildPythonPackage {
1819
pkgs.bubblewrap
1920
pkgs.python3Packages.xlib
2021
pkgs.python3Packages.filelock
22+
pkgs.python3Packages.urllib3
2123
];
2224
makeFlags = [ "PYTHON_INTERPRETER=${pyth1}/bin/python" "SHELL_INTERPRETER=/run/current-system/sw/bin/bash" "DESTDIR=${placeholder "out"}" ];
2325
dontUseMesonConfigure = true;

0 commit comments

Comments
 (0)