diff options
author | Ludovic Courtès <ludo@gnu.org> | 2021-07-16 16:19:35 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-07-24 16:23:23 +0200 |
commit | 377e9453caf16417fc4ec8a2b65db1ac4ba0d5ff (patch) | |
tree | 0d13c402749cc08c397579f87b844b714212e909 /gnu/packages/engineering.scm | |
parent | 425ccde6ae7bd4b448ee2fffd8c0b6b7bcbb543c (diff) | |
download | guix-377e9453caf16417fc4ec8a2b65db1ac4ba0d5ff.tar.gz |
gnu: Use 'search-input-file' when looking for *.so and *.a.
* gnu/packages/bioinformatics.scm (sailfish)[arguments]: Use 'search-input-file' when looking for *.a and *.so. * gnu/packages/emulators.scm (dolphin-emu): Likewise. * gnu/packages/engineering.scm (lepton-eda): Likewise. (pcb): Likewise. * gnu/packages/golang.scm (go-1.4): Likewise. (go-1.14): Likewise. * gnu/packages/haskell.scm (ghc-7): Likewise. * gnu/packages/irods.scm (irods): Likewise. * gnu/packages/language.scm (python2-tegaki-pygtk): Likewise. * gnu/packages/lisp-xyz.scm (sbcl-lzlib): Likewise. (sbcl-cl-gobject-introspection): Likewise. (sbcl-cl-ana): Likewise. (sbcl-cl-libuv): Likewise. (sbcl-cl-async): Likewise. (sbcl-mcclim): Likewise. (sbcl-zstd): Likewise. (sbcl-cl-opengl): Likewise. (sbcl-lev): Likewise. (sbcl-cl-glfw3): Likewise. * gnu/packages/machine-learning.scm (tensorflow): Likewise. * gnu/packages/messaging.scm (utox): Likewise. * gnu/packages/mpi.scm (java-openmpi): Likewise. * gnu/packages/music.scm (jack-select): Likewise. * gnu/packages/pascal.scm (fpc): Likewise. * gnu/packages/python-crypto.scm (python-libnacl): Likewise. * gnu/packages/python-xyz.scm (python-cairocffi): Likewise. (python-pyev): Likewise. (python-pytidylib): Likewise. * gnu/packages/radio.scm (unixcw): Likewise. * gnu/packages/rust.scm (rust-1.32): Likewise. * gnu/packages/security-token.scm (opensc): Likewise. (python-pyscard): Likewise. * gnu/packages/selinux.scm (python-setools): Likewise. * gnu/packages/spice.scm (libcacard): Likewise. * gnu/packages/telephony.scm (libtgvoip): Likewise.
Diffstat (limited to 'gnu/packages/engineering.scm')
-rw-r--r-- | gnu/packages/engineering.scm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index aa74d691c7..4e01bf8b3e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -335,12 +335,10 @@ utilities.") (substitute* '("libleptongui/scheme/schematic/ffi/gtk.scm.in" "utils/attrib/lepton-attrib.scm") (("@LIBGTK@") - (string-append (assoc-ref inputs "gtk") - "/lib/libgtk-3.so"))) + (search-input-file inputs "/lib/libgtk-3.so"))) (substitute* '("libleptongui/scheme/schematic/ffi/gobject.scm.in") (("@LIBGOBJECT@") - (string-append (assoc-ref inputs "glib") - "/lib/libgobject-2.0.so"))) + (search-input-file inputs "/lib/libgobject-2.0.so"))) (substitute* "liblepton/scheme/lepton/ffi.scm.in" (("@LIBLEPTON@") (string-append (assoc-ref outputs "out") @@ -351,8 +349,7 @@ utilities.") "/lib/libleptonattrib.so"))) (substitute* "liblepton/scheme/lepton/log.scm.in" (("@LIBGLIB@") - (string-append (assoc-ref inputs "glib") - "/lib/libglib-2.0.so"))) + (search-input-file inputs "/lib/libglib-2.0.so"))) ;; For finding libraries when running tests before installation. (setenv "LIBLEPTONGUI" @@ -437,7 +434,8 @@ features."))) ;; fix of the mesa package we wrap the pcb executable such that ;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH. (let* ((out (assoc-ref outputs "out")) - (path (string-append (assoc-ref inputs "udev") "/lib"))) + (path (dirname + (search-input-file inputs "/lib/libudev.so")))) (wrap-program (string-append out "/bin/pcb") `("LD_LIBRARY_PATH" ":" prefix (,path)))) #t)) |