Skip to content

Commit

Permalink
Patch makefile to not vendor on nix (#297)
Browse files Browse the repository at this point in the history
  • Loading branch information
LovingMelody authored Dec 1, 2024
1 parent 3277b47 commit e559e2e
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
24 changes: 24 additions & 0 deletions packaging/nix/0-Makefile-no-vendor.patch
Original file line number Diff line number Diff line change
@@ -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


2 changes: 2 additions & 0 deletions packaging/nix/umu-launcher.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down

0 comments on commit e559e2e

Please sign in to comment.