diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-03-21 23:39:43 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-03-21 23:39:43 -0400 |
commit | a9429c8f2207841c649438187d6e19046d323a16 (patch) | |
tree | a06e4b8a87b6a42742cf6750276746a10b6c2139 /gnu/packages/patches/upower-builddir.patch | |
parent | f0136b36ae8c1e9c174043bd50e0e24413c0f345 (diff) | |
parent | 49b350fafc2c3ea1db66461b73d4e304cd13ec92 (diff) |
Merge branch 'staging' into core-updates.
Diffstat (limited to 'gnu/packages/patches/upower-builddir.patch')
-rw-r--r-- | gnu/packages/patches/upower-builddir.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/gnu/packages/patches/upower-builddir.patch b/gnu/packages/patches/upower-builddir.patch deleted file mode 100644 index a61d387faf..0000000000 --- a/gnu/packages/patches/upower-builddir.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 27ae011b31d831752b97eb209bc2b2206fcf40f7 Mon Sep 17 00:00:00 2001 -From: Tobias Geerinckx-Rice <me@tobias.gr> -Date: Mon, 28 Jun 2021 11:58:47 +0200 -Subject: [PATCH] gnu: upower: Fix build directory. - -Remove explicit set of UPOWER_CONF_FILE_NAME in up-self-test.c; -instead the harness should set it. In Guix we set it explicitly; the -right thing is to use AM_TEST_ENVIRONMENT and regenerate the -makefiles, but we can't regenerate because current autotools carp on -some things, so we patch the Makefile.in instead. - -Also fix to not try to create /var/lib/upower if /var isn't writable. - -Based on a patch by Andy Wingo <wingo@igalia.com> ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 3400139..f51ee89 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -181,7 +181,7 @@ $(systemdservice_DATA): $(systemdservice_in_files) Makefile - endif - - install-data-hook: -- if test -w $(DESTDIR)$(prefix)/; then \ -+ if test -w $(DESTDIR)$(localstatedir)/; then \ - mkdir -p $(DESTDIR)$(historydir); \ - fi - --- -2.32.0 - |