Change-Id: Id12590b45317a3d965ee4d715e696e5402de85e4 --- gnu/local.mk | 1 - gnu/packages/patches/elogind-fix-rpath.patch | 60 -------------------- 2 files changed, 61 deletions(-) delete mode 100644 gnu/packages/patches/elogind-fix-rpath.patch
diff --git a/gnu/local.mk b/gnu/local.mk index 8e7abc8a47..dd5d6e0c85 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1170,7 +1170,6 @@ dist_patch_DATA = \ %D%/packages/patches/elm-ghc9.2.patch \ %D%/packages/patches/elm-offline-package-registry.patch \ %D%/packages/patches/elm-reactor-static-files.patch \ - %D%/packages/patches/elogind-fix-rpath.patch \ %D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \ %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \ %D%/packages/patches/emacs-elpy-dup-test-name.patch \ diff --git a/gnu/packages/patches/elogind-fix-rpath.patch b/gnu/packages/patches/elogind-fix-rpath.patch deleted file mode 100644 index 2a76cc467f..0000000000 --- a/gnu/packages/patches/elogind-fix-rpath.patch +++ /dev/null @@ -1,60 +0,0 @@ -Retrieved from https://github.com/elogind/elogind/issues/258 - -From: Mark Hindley <m...@hindley.org.uk> -Date: Wed, 24 May 2023 10:39:41 +0100 -Subject: Fixup_executable_rpath - -./meson.build sets - - install_rpath : rootlibexecdir - -however src/shared/meson.build sets - -libshared = shared_library( - [snip] - install_dir : rootpkglibdir - ) ---- - meson.build | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index 694a2fd..a575f69 100644 ---- a/meson.build -+++ b/meson.build -@@ -2903,7 +2903,7 @@ executable('elogind', - dependencies : [threads, - libacl, - libudev], -- install_rpath : rootlibexecdir, -+ install_rpath : rootpkglibdir, - install : true, - install_dir : rootlibexecdir) - -@@ -2913,7 +2913,7 @@ exe = executable('loginctl', - link_with : [libshared], - dependencies : [threads, - libudev], -- install_rpath : rootlibexecdir, -+ install_rpath : rootpkglibdir, - install : true, - install_dir : rootbindir) - public_programs += [exe] -@@ -2923,7 +2923,7 @@ exe = executable('elogind-inhibit', - include_directories : includes, - link_with : [libshared], - dependencies : [threads], -- install_rpath : rootlibexecdir, -+ install_rpath : rootpkglibdir, - install : true, - install_dir : rootbindir) - public_programs += [exe] -@@ -4283,7 +4283,7 @@ executable('elogind-uaccess-command', - libshared], - dependencies: [libacl, - libudev], -- install_rpath : rootlibexecdir, -+ install_rpath : rootpkglibdir, - install : true, - install_dir : rootlibexecdir) - #endif // 0 -- 2.46.0
