me/guix
Archived
1
0
Fork 0
Code Activity

gnu: discover: Don't use patchelf.

Browse source 
* gnu/packages/kde-plasma.scm (discover)[arguments]: Add phase to set LDFLAGS
instead of patching RUNPATH directly.
[native-inputs]: Remove PATCHELF.
This commit is contained in:
Marius Bakke 2022-11-21 15:25:38 +01:00
parent c939f55855
commit 787fd473be
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 11 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gnu/packages/kde-plasma.scm
View file

@ -37,7 +37,6 @@
#:use-module (gnu packages authentication) #:use-module (gnu packages authentication)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages elf) ; patchelf
#:use-module (gnu packages display-managers) #:use-module (gnu packages display-managers)
#:use-module (gnu packages firmware) #:use-module (gnu packages firmware)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
@ -149,32 +148,17 @@ Breeze is the default theme for the KDE Plasma desktop.")
"01vdi66c7v60db25p0qi0q73wgqw6dy2kirbk34bvhld41gpxhhv")))) "01vdi66c7v60db25p0qi0q73wgqw6dy2kirbk34bvhld41gpxhhv"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
(list #:phases #~(modify-phases %standard-phases (list #:phases
(add-after 'install 'fix-so #~(modify-phases %standard-phases
(lambda* _ (add-before 'configure 'set-LDFLAGS
(invoke "patchelf" "--replace-needed" (lambda _
"libDiscoverCommon.so" (setenv "LDFLAGS" (string-append "-Wl,-rpath=" #$output
(string-append #$output "/lib/plasma-discover"))))
"/lib/plasma-discover/libDiscoverCommon.so")
(string-append #$output
"/lib/qt5/plugins/discover/fwupd-backend.so"))
(invoke "patchelf" "--replace-needed"
"libDiscoverCommon.so"
(string-append #$output
"/lib/plasma-discover/libDiscoverCommon.so")
(string-append #$output
"/lib/qt5/plugins/discover/packagekit-backend.so"))
(invoke "patchelf" "--replace-needed"
"libDiscoverCommon.so"
(string-append #$output
"/lib/plasma-discover/libDiscoverCommon.so")
(string-append #$output
"/lib/qt5/plugins/discover/kns-backend.so"))))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(invoke "ctest" "-E" "knsbackendtest"))))))) (invoke "ctest" "-E" "knsbackendtest")))))))
(native-inputs (list extra-cmake-modules patchelf pkg-config)) (native-inputs (list extra-cmake-modules pkg-config))
(inputs (list appstream-qt (inputs (list appstream-qt
attica attica
fwupd ; optional fwupd ; optional