diff --git a/pkgs/by-name/li/lirc/package.nix b/pkgs/by-name/li/lirc/package.nix index 5a53ccacdca6..dab65cb7901a 100644 --- a/pkgs/by-name/li/lirc/package.nix +++ b/pkgs/by-name/li/lirc/package.nix @@ -51,15 +51,14 @@ stdenv.mkDerivation (finalAttrs: { # --with-systemdsystemunitdir # https://sourceforge.net/p/lirc/tickets/385/ ./ubuntu.diff + + # fix overriding PYTHONPATH + ./pythonpath.patch ]; postPatch = '' patchShebangs . - # fix overriding PYTHONPATH - sed -i 's,^PYTHONPATH *= *,PYTHONPATH := $(PYTHONPATH):,' \ - Makefile.in - # Pull fix for new pyyaml pending upstream inclusion # https://sourceforge.net/p/lirc/git/merge-requests/39/ substituteInPlace python-pkg/lirc/database.py \ diff --git a/pkgs/by-name/li/lirc/pythonpath.patch b/pkgs/by-name/li/lirc/pythonpath.patch new file mode 100644 index 000000000000..53605962ecaa --- /dev/null +++ b/pkgs/by-name/li/lirc/pythonpath.patch @@ -0,0 +1,13 @@ +diff --git i/Makefile.in w/Makefile.in +index d039ed3e9d6a..c40e6eac56ae 100644 +--- i/Makefile.in ++++ w/Makefile.in +@@ -493,7 +493,7 @@ AUTOMAKE_OPTIONS = 1.5 check-news dist-bzip2 -Wno-portability \ + + PYTHONPATH1 = $(abs_top_srcdir)/python-pkg/lirc: + PYTHONPATH2 = $(abs_top_srcdir)/python-pkg/lirc/lib/.libs +-PYTHONPATH = $(PYTHONPATH1):$(PYTHONPATH2) ++PYTHONPATH := $(PYTHONPATH):$(PYTHONPATH1):$(PYTHONPATH2) + PYLINT = python3-pylint + pylint_template = {path}:{line}: [{msg_id}({symbol}), {obj}] {msg} + GIT_COMMIT = $(shell git log -1 --pretty=format:%h || echo UNKNOWN)