me/guix
Archived
1
0
Fork 0
Code Activity

gnu: Use 'search-input-file' when looking for *.so and *.a.

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2021-07-16 16:19:35 +02:00
parent 425ccde6ae
commit 377e9453ca
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
21 changed files with 70 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/bioinformatics.scm
View file

@ -9481,13 +9481,13 @@ dependency like SeqAn.")
inputs inputs
(string-append "/include/jellyfish-" ,(package-version jellyfish)))) (string-append "/include/jellyfish-" ,(package-version jellyfish))))
(("\\$\\{GAT_SOURCE_DIR\\}/external/install/lib/libjellyfish-2.0.a") (("\\$\\{GAT_SOURCE_DIR\\}/external/install/lib/libjellyfish-2.0.a")
(string-append (assoc-ref inputs "jellyfish") (search-input-file inputs
"/lib/libjellyfish-2.0.a")) "/lib/libjellyfish-2.0.a"))
(("\\$\\{GAT_SOURCE_DIR\\}/external/install/lib/libdivsufsort.a") (("\\$\\{GAT_SOURCE_DIR\\}/external/install/lib/libdivsufsort.a")
(string-append (assoc-ref inputs "libdivsufsort") (search-input-file inputs
"/lib/libdivsufsort.so")) "/lib/libdivsufsort.so"))
(("\\$\\{GAT_SOURCE_DIR\\}/external/install/lib/libdivsufsort64.a") (("\\$\\{GAT_SOURCE_DIR\\}/external/install/lib/libdivsufsort64.a")
(string-append (assoc-ref inputs "libdivsufsort") (search-input-file inputs
"/lib/libdivsufsort64.so"))) "/lib/libdivsufsort64.so")))
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
;; Don't prefer static libs ;; Don't prefer static libs

3
gnu/packages/emulators.scm
View file

@ -286,8 +286,7 @@ console.")
(string-append (assoc-ref inputs "font-wqy-microhei") (string-append (assoc-ref inputs "font-wqy-microhei")
"/share/fonts/truetype/wqy-microhei.ttc")) "/share/fonts/truetype/wqy-microhei.ttc"))
(libvulkan (libvulkan
(string-append (assoc-ref inputs "vulkan-loader") (search-input-file inputs "/lib/libvulkan.so")))
"/lib/libvulkan.so")))
(chdir "docs") (chdir "docs")
(invoke "bash" "-c" "g++ -O2 $(freetype-config \ (invoke "bash" "-c" "g++ -O2 $(freetype-config \
--cflags --libs) gc-font-tool.cpp -o gc-font-tool") --cflags --libs) gc-font-tool.cpp -o gc-font-tool")

12
gnu/packages/engineering.scm
View file

@ -335,12 +335,10 @@ utilities.")
(substitute* '("libleptongui/scheme/schematic/ffi/gtk.scm.in" (substitute* '("libleptongui/scheme/schematic/ffi/gtk.scm.in"
"utils/attrib/lepton-attrib.scm") "utils/attrib/lepton-attrib.scm")
(("@LIBGTK@") (("@LIBGTK@")
(string-append (assoc-ref inputs "gtk") (search-input-file inputs "/lib/libgtk-3.so")))
"/lib/libgtk-3.so")))
(substitute* '("libleptongui/scheme/schematic/ffi/gobject.scm.in") (substitute* '("libleptongui/scheme/schematic/ffi/gobject.scm.in")
(("@LIBGOBJECT@") (("@LIBGOBJECT@")
(string-append (assoc-ref inputs "glib") (search-input-file inputs "/lib/libgobject-2.0.so")))
"/lib/libgobject-2.0.so")))
(substitute* "liblepton/scheme/lepton/ffi.scm.in" (substitute* "liblepton/scheme/lepton/ffi.scm.in"
(("@LIBLEPTON@") (("@LIBLEPTON@")
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
@ -351,8 +349,7 @@ utilities.")
"/lib/libleptonattrib.so"))) "/lib/libleptonattrib.so")))
(substitute* "liblepton/scheme/lepton/log.scm.in" (substitute* "liblepton/scheme/lepton/log.scm.in"
(("@LIBGLIB@") (("@LIBGLIB@")
(string-append (assoc-ref inputs "glib") (search-input-file inputs "/lib/libglib-2.0.so")))
"/lib/libglib-2.0.so")))
;; For finding libraries when running tests before installation. ;; For finding libraries when running tests before installation.
(setenv "LIBLEPTONGUI" (setenv "LIBLEPTONGUI"
@ -437,7 +434,8 @@ features.")))
;; fix of the mesa package we wrap the pcb executable such that ;; fix of the mesa package we wrap the pcb executable such that
;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH. ;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH.
(let* ((out (assoc-ref outputs "out")) (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") (wrap-program (string-append out "/bin/pcb")
`("LD_LIBRARY_PATH" ":" prefix (,path)))) `("LD_LIBRARY_PATH" ":" prefix (,path))))
#t)) #t))

4
gnu/packages/golang.scm
View file

@ -1060,7 +1060,7 @@ your Go binary to be later served from an http.FileSystem.")
(add-before 'build 'prebuild (add-before 'build 'prebuild
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib"))
(ld (string-append (assoc-ref inputs "libc") "/lib")) (ld (dirname (search-input-file inputs "/lib/libc.so")))
(loader (car (find-files ld "^ld-linux.+"))) (loader (car (find-files ld "^ld-linux.+")))
(net-base (assoc-ref inputs "net-base")) (net-base (assoc-ref inputs "net-base"))
(tzdata-path (tzdata-path
@ -1208,7 +1208,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(replace 'prebuild (replace 'prebuild
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib"))
(ld (string-append (assoc-ref inputs "libc") "/lib")) (ld (dirname (search-input-file inputs "/lib/libc.so")))
(loader (car (find-files ld "^ld-linux.+"))) (loader (car (find-files ld "^ld-linux.+")))
(net-base (assoc-ref inputs "net-base")) (net-base (assoc-ref inputs "net-base"))
(tzdata-path (tzdata-path

7
gnu/packages/haskell.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu> ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
@ -246,9 +246,8 @@ top of CLISP.")
(gmp-lib (string-append gmp "/lib")) (gmp-lib (string-append gmp "/lib"))
(gmp-include (string-append gmp "/include")) (gmp-include (string-append gmp "/include"))
(ncurses-lib (ncurses-lib
(string-append (assoc-ref inputs "ncurses") "/lib")) (dirname (search-input-file inputs "/lib/libncurses.so")))
(ld-so (string-append (assoc-ref inputs "libc") (ld-so (search-input-file inputs ,(glibc-dynamic-linker)))
,(glibc-dynamic-linker)))
(libtinfo-dir (libtinfo-dir
(string-append ghc-bootstrap-prefix (string-append ghc-bootstrap-prefix
"/lib/ghc-7.8.4/terminfo-0.4.0.0"))) "/lib/ghc-7.8.4/terminfo-0.4.0.0")))

2
gnu/packages/irods.scm
View file

@ -120,7 +120,7 @@
(("'usr', 'lib', 'irods'") "'lib', 'irods'")) (("'usr', 'lib', 'irods'") "'lib', 'irods'"))
(substitute* "scripts/irods/pypyodbc.py" (substitute* "scripts/irods/pypyodbc.py"
(("\"/usr/lib/libodbc.so\"") (("\"/usr/lib/libodbc.so\"")
(string-append (assoc-ref inputs "unixodbc") "/lib/libodbc.so"))))) (search-input-file inputs "/lib/libodbc.so")))))
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((gcc (assoc-ref inputs "gcc"))) (let ((gcc (assoc-ref inputs "gcc")))

7
gnu/packages/language.scm
View file

@ -975,10 +975,11 @@ suitable for both the desktop and mobile devices.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "tegakigtk/fakekey.py" (substitute* "tegakigtk/fakekey.py"
(("libX11.so.6" so) (("libX11.so.6" so)
(string-append (assoc-ref inputs "libx11") "/lib/" so)) (search-input-file inputs
(string-append "/lib/" so)))
(("libXtst.so.6" so) (("libXtst.so.6" so)
(string-append (assoc-ref inputs "libxtst") "/lib/" so))) (search-input-file inputs
#t)))))) (string-append "/lib/" so))))))))))
(inputs ; required for sending key strokes (inputs ; required for sending key strokes
`(("libx11" ,libx11) `(("libx11" ,libx11)
("libxtst" ,libxtst))) ("libxtst" ,libxtst)))

50
gnu/packages/lisp-xyz.scm
View file

@ -7248,7 +7248,7 @@ cl-plumbing libraries.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/lzlib.lisp" (substitute* "src/lzlib.lisp"
(("liblz\\.so") (("liblz\\.so")
(string-append (assoc-ref inputs "lzlib") "/lib/liblz.so"))) (search-input-file inputs "/lib/liblz.so")))
#t))))) #t)))))
(synopsis "Common Lisp library for lzip (de)compression") (synopsis "Common Lisp library for lzip (de)compression")
(description (description
@ -7403,11 +7403,10 @@ function.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/init.lisp" (substitute* "src/init.lisp"
(("libgobject-2\\.0\\.so") (("libgobject-2\\.0\\.so")
(string-append (assoc-ref inputs "glib") "/lib/libgobject-2.0.so")) (search-input-file inputs "/lib/libgobject-2.0.so"))
(("libgirepository-1\\.0\\.so") (("libgirepository-1\\.0\\.so")
(string-append (assoc-ref inputs "gobject-introspection") (search-input-file inputs
"/lib/libgirepository-1.0.so"))) "/lib/libgirepository-1.0.so"))))))))
#t)))))
(synopsis "Common Lisp bindings to GObject Introspection") (synopsis "Common Lisp bindings to GObject Introspection")
(description (description
"This library is a bridge between Common Lisp and GObject "This library is a bridge between Common Lisp and GObject
@ -8565,8 +8564,7 @@ sacrificing much in the way of power.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "hdf-cffi/hdf-cffi.lisp" (substitute* "hdf-cffi/hdf-cffi.lisp"
(("/usr/lib/i386-linux-gnu/hdf5/serial/libhdf5.so") (("/usr/lib/i386-linux-gnu/hdf5/serial/libhdf5.so")
(string-append (assoc-ref inputs "hdf5") (search-input-file inputs "/lib/libhdf5.so")))
"/lib/libhdf5.so")))
(substitute* "gsl-cffi/gsl-cffi.lisp" (substitute* "gsl-cffi/gsl-cffi.lisp"
(("define-foreign-library gsl-cffi" all) (("define-foreign-library gsl-cffi" all)
(string-append all " (:unix " (string-append all " (:unix "
@ -8896,9 +8894,7 @@ has a small codebase that's easy to understand and use.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "lib.lisp" (substitute* "lib.lisp"
(("/usr/lib/libuv.so") (("/usr/lib/libuv.so")
(string-append (assoc-ref inputs "libuv") (search-input-file inputs "/lib/libuv.so")))))
"/lib/libuv.so")))
#t))
(add-after 'fix-paths 'fix-system-definition (add-after 'fix-paths 'fix-system-definition
(lambda _ (lambda _
(substitute* "cl-libuv.asd" (substitute* "cl-libuv.asd"
@ -8956,12 +8952,9 @@ has a small codebase that's easy to understand and use.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/ssl/package.lisp" (substitute* "src/ssl/package.lisp"
(("libcrypto\\.so") (("libcrypto\\.so")
(string-append (assoc-ref inputs "openssl") (search-input-file inputs "/lib/libcrypto.so"))
"/lib/libcrypto.so"))
(("libssl\\.so") (("libssl\\.so")
(string-append (assoc-ref inputs "openssl") (search-input-file inputs "/lib/libssl.so"))))))))
"/lib/libssl.so")))
#t)))))
(synopsis "Asynchronous operations for Common Lisp") (synopsis "Asynchronous operations for Common Lisp")
(description (description
"Cl-async is a library for general purpose, non-blocking programming in "Cl-async is a library for general purpose, non-blocking programming in
@ -12261,13 +12254,10 @@ and saving 2-dimensional pixel-based images.")
"/share/fonts/truetype/"))) "/share/fonts/truetype/")))
(substitute* "Extensions/fontconfig/src/functions.lisp" (substitute* "Extensions/fontconfig/src/functions.lisp"
(("libfontconfig\\.so") (("libfontconfig\\.so")
(string-append (assoc-ref inputs "fontconfig") (search-input-file inputs "/lib/libfontconfig.so")))
"/lib/libfontconfig.so")))
(substitute* "Extensions/harfbuzz/src/functions.lisp" (substitute* "Extensions/harfbuzz/src/functions.lisp"
(("libharfbuzz\\.so") (("libharfbuzz\\.so")
(string-append (assoc-ref inputs "harfbuzz") (search-input-file inputs "/lib/libharfbuzz.so")))))
"/lib/libharfbuzz.so")))
#t))
(add-after 'unpack 'fix-build (add-after 'unpack 'fix-build
(lambda _ (lambda _
;; The cffi-grovel system does not get loaded automatically, ;; The cffi-grovel system does not get loaded automatically,
@ -14418,9 +14408,7 @@ library are feedforward neural networks trained using backpropagation.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/libzstd.lisp" (substitute* "src/libzstd.lisp"
(("libzstd\\.so") (("libzstd\\.so")
(string-append (assoc-ref inputs "zstd-lib") (search-input-file inputs "/lib/libzstd.so"))))))))
"/lib/libzstd.so")))
#t)))))
(synopsis "Common Lisp library for Zstandard (de)compression") (synopsis "Common Lisp library for Zstandard (de)compression")
(description (description
"This Common Lisp library provides functions for Zstandard "This Common Lisp library provides functions for Zstandard
@ -15986,14 +15974,13 @@ compiled foreign library collection.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "gl/library.lisp" (substitute* "gl/library.lisp"
(("libGL.so" all) (("libGL.so" all)
(string-append (assoc-ref inputs "mesa") "/lib/" all))) (search-input-file inputs "/lib/libGL.so")))
(substitute* "glu/library.lisp" (substitute* "glu/library.lisp"
(("libGLU.so" all) (("libGLU.so" all)
(string-append (assoc-ref inputs "glu") "/lib/" all))) (search-input-file inputs "/lib/libGLU.so")))
(substitute* "glut/library.lisp" (substitute* "glut/library.lisp"
(("libglut.so" all) (("libglut.so" all)
(string-append (assoc-ref inputs "freeglut") "/lib/" all))) (search-input-file inputs "/lib/libglut.so"))))))))
#t)))))
(inputs (inputs
`(("alexandria" ,sbcl-alexandria) `(("alexandria" ,sbcl-alexandria)
("cffi" ,sbcl-cffi) ("cffi" ,sbcl-cffi)
@ -16926,9 +16913,8 @@ Common Lisp.")
(add-after 'unpack 'patch-libev-lib-path (add-after 'unpack 'patch-libev-lib-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/lev.lisp" (substitute* "src/lev.lisp"
(("libev.so" all) (("libev.so" _)
(string-append (assoc-ref inputs "libev") (search-input-file inputs "/lib/libev.so"))))))))
"/lib/" all))))))))
(inputs (inputs
`(("cffi" ,sbcl-cffi) `(("cffi" ,sbcl-cffi)
("libev" ,libev))) ("libev" ,libev)))
@ -17503,8 +17489,8 @@ and even allows the generic visualisation of graphs in this format.")
(add-after 'unpack 'patch-glfw-lib-path (add-after 'unpack 'patch-glfw-lib-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "glfw-bindings.lisp" (substitute* "glfw-bindings.lisp"
(("libglfw.so.3" all) (("libglfw.so.3" _)
(string-append (assoc-ref inputs "glfw") "/lib/" all)))))))) (search-input-file inputs "/lib/libglfw.so.3"))))))))
(inputs (inputs
`(("alexandria" ,sbcl-alexandria) `(("alexandria" ,sbcl-alexandria)
("cffi" ,sbcl-cffi) ("cffi" ,sbcl-cffi)

15
gnu/packages/machine-learning.scm
View file

@ -1588,36 +1588,31 @@ Python.")
;; Sqlite ;; Sqlite
(("include\\(sqlite\\)") "") (("include\\(sqlite\\)") "")
(("\\$\\{sqlite_STATIC_LIBRARIES\\}") (("\\$\\{sqlite_STATIC_LIBRARIES\\}")
(string-append (assoc-ref inputs "sqlite") (search-input-file inputs "/lib/libsqlite3.so"))
"/lib/libsqlite3.so"))
(("sqlite_copy_headers_to_destination") "") (("sqlite_copy_headers_to_destination") "")
;; PNG ;; PNG
(("include\\(png\\)") "") (("include\\(png\\)") "")
(("\\$\\{png_STATIC_LIBRARIES\\}") (("\\$\\{png_STATIC_LIBRARIES\\}")
(string-append (assoc-ref inputs "libpng") (search-input-file inputs "/lib/libpng16.so"))
"/lib/libpng16.so"))
(("png_copy_headers_to_destination") "") (("png_copy_headers_to_destination") "")
;; JPEG ;; JPEG
(("include\\(jpeg\\)") "") (("include\\(jpeg\\)") "")
(("\\$\\{jpeg_STATIC_LIBRARIES\\}") (("\\$\\{jpeg_STATIC_LIBRARIES\\}")
(string-append (assoc-ref inputs "libjpeg") (search-input-file inputs "/lib/libjpeg.so"))
"/lib/libjpeg.so"))
(("jpeg_copy_headers_to_destination") "") (("jpeg_copy_headers_to_destination") "")
;; GIF ;; GIF
(("include\\(gif\\)") "") (("include\\(gif\\)") "")
(("\\$\\{gif_STATIC_LIBRARIES\\}") (("\\$\\{gif_STATIC_LIBRARIES\\}")
(string-append (assoc-ref inputs "giflib") (search-input-file inputs "/lib/libgif.so"))
"/lib/libgif.so"))
(("gif_copy_headers_to_destination") "") (("gif_copy_headers_to_destination") "")
;; lmdb ;; lmdb
(("include\\(lmdb\\)") "") (("include\\(lmdb\\)") "")
(("\\$\\{lmdb_STATIC_LIBRARIES\\}") (("\\$\\{lmdb_STATIC_LIBRARIES\\}")
(string-append (assoc-ref inputs "lmdb") (search-input-file inputs "/lib/liblmdb.so"))
"/lib/liblmdb.so"))
(("lmdb_copy_headers_to_destination") "") (("lmdb_copy_headers_to_destination") "")
;; Protobuf ;; Protobuf

3
gnu/packages/messaging.scm
View file

@ -1537,8 +1537,7 @@ messenger protocol.")
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "../source/src/xlib/gtk.c" (substitute* "../source/src/xlib/gtk.c"
(("libgtk-3.so") (("libgtk-3.so")
(string-append (assoc-ref inputs "gtk+") (search-input-file inputs "/lib/libgtk-3.so")))))
"/lib/libgtk-3.so")))))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out") (wrap-program (string-append (assoc-ref outputs "out")

3
gnu/packages/mpi.scm
View file

@ -348,8 +348,7 @@ software vendors, application developers and computer science researchers.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "ompi/mpi/java/c/Makefile.in" (substitute* "ompi/mpi/java/c/Makefile.in"
(("\\$\\(top_builddir\\)/ompi/lib@OMPI_LIBMPI_NAME@.la") (("\\$\\(top_builddir\\)/ompi/lib@OMPI_LIBMPI_NAME@.la")
(string-append (assoc-ref inputs "openmpi") "/lib/libmpi.la"))) (search-input-file inputs "/lib/libmpi.la")))))
#t))
(add-after 'install 'strip-jar-timestamps (add-after 'install 'strip-jar-timestamps
(assoc-ref ant:%standard-phases 'strip-jar-timestamps))))))) (assoc-ref ant:%standard-phases 'strip-jar-timestamps)))))))
(synopsis "Java bindings for MPI"))) (synopsis "Java bindings for MPI")))

4
gnu/packages/music.scm
View file

@ -3045,9 +3045,7 @@ can connect to any JACK port and record the output into a stereo WAV file.")
;; Fix reference to dlopened libraries. ;; Fix reference to dlopened libraries.
(substitute* "jackselect/alsainfo.py" (substitute* "jackselect/alsainfo.py"
(("libasound.so.2") (("libasound.so.2")
(string-append (assoc-ref inputs "alsa-lib") (search-input-file inputs "/lib/libasound.so.2")))))
"/lib/libasound.so.2")))
#t))
(replace 'build (replace 'build
(assoc-ref python:%standard-phases 'build)) (assoc-ref python:%standard-phases 'build))
(add-after 'install 'wrap (add-after 'install 'wrap

6
gnu/packages/pascal.scm
View file

@ -150,11 +150,9 @@
(substitute* "fpcsrc/compiler/systems/t_linux.pas" (substitute* "fpcsrc/compiler/systems/t_linux.pas"
;; Point to the current glibc dynamic linker. ;; Point to the current glibc dynamic linker.
(("/lib/ld-linux.so.2") (("/lib/ld-linux.so.2")
(string-append (assoc-ref inputs "libc") (search-input-file inputs ,(glibc-dynamic-linker)))
,(glibc-dynamic-linker)))
(("/lib64/ld-linux-x86-64.so.2") (("/lib64/ld-linux-x86-64.so.2")
(string-append (assoc-ref inputs "libc") (search-input-file inputs ,(glibc-dynamic-linker)))
,(glibc-dynamic-linker)))
; TODO: /lib/ld-linux-armhf.so.3 ; TODO: /lib/ld-linux-armhf.so.3
; TODO: /lib/ld-linux-aarch64.so.1 ; TODO: /lib/ld-linux-aarch64.so.1
; TODO: /lib64/ld64.so.2 ; TODO: /lib64/ld64.so.2

4
gnu/packages/python-crypto.scm
View file

@ -1177,9 +1177,7 @@ none of them have everything that I'd like, so here's one more. It uses
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "libnacl/__init__.py" (substitute* "libnacl/__init__.py"
(("/usr/local/lib/libsodium.so") (("/usr/local/lib/libsodium.so")
(string-append (assoc-ref inputs "libsodium") (search-input-file inputs "/lib/libsodium.so"))))))))
"/lib/libsodium.so")))
#t)))))
(native-inputs (native-inputs
`(("python-pyhamcrest" ,python-pyhamcrest))) `(("python-pyhamcrest" ,python-pyhamcrest)))
(inputs (inputs

22
gnu/packages/python-xyz.scm
View file

@ -6926,22 +6926,16 @@ support for Python 3 and PyPy. It is based on cffi.")
(("filenames = \\(library_filename,\\) \\+ filenames") (("filenames = \\(library_filename,\\) \\+ filenames")
"pass") "pass")
(("libcairo.so.2") (("libcairo.so.2")
(string-append (assoc-ref inputs "cairo") (search-input-file inputs "/lib/libcairo.so.2")))
"/lib/libcairo.so.2")))
(substitute* "cairocffi/pixbuf.py" (substitute* "cairocffi/pixbuf.py"
(("libgdk_pixbuf-2.0.so.0") (("libgdk_pixbuf-2.0.so.0")
(string-append (assoc-ref inputs "gdk-pixbuf") (search-input-file inputs "/lib/libgdk_pixbuf-2.0.so.0"))
"/lib/libgdk_pixbuf-2.0.so.0"))
(("libgobject-2.0.so.0") (("libgobject-2.0.so.0")
(string-append (assoc-ref inputs "glib") (search-input-file inputs "/lib/libgobject-2.0.so.0"))
"/lib/libgobject-2.0.so.0"))
(("libglib-2.0.so.0") (("libglib-2.0.so.0")
(string-append (assoc-ref inputs "glib") (search-input-file inputs "/lib/libglib-2.0.so.0"))
"/lib/libglib-2.0.so.0"))
(("libgdk-3.so.0") (("libgdk-3.so.0")
(string-append (assoc-ref inputs "gtk+") (search-input-file inputs "/lib/libgdk-3.so.0")))))
"/lib/libgdk-3.so.0")))
#t))
(add-after 'unpack 'disable-linters (add-after 'unpack 'disable-linters
;; Their check fails; none of our business. ;; Their check fails; none of our business.
(lambda _ (lambda _
@ -16131,8 +16125,7 @@ Record Format (DWARF).")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch (add-after 'unpack 'patch
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((libev (string-append (assoc-ref inputs "libev") (let ((libev (search-input-file inputs "/lib/libev.so.4")))
"/lib/libev.so.4")))
(substitute* "setup.py" (substitute* "setup.py"
(("libev_dll_name = find_library\\(\\\"ev\\\"\\)") (("libev_dll_name = find_library\\(\\\"ev\\\"\\)")
(string-append "libev_dll_name = \"" libev "\""))))))))) (string-append "libev_dll_name = \"" libev "\"")))))))))
@ -24284,8 +24277,7 @@ be necessary when using @code{cmd}.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'build 'qualify-libtidy (add-before 'build 'qualify-libtidy
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((libtidy (string-append (assoc-ref inputs "tidy") (let ((libtidy (search-input-file inputs "/lib/libtidy.so")))
"/lib/libtidy.so")))
(substitute* "tidylib/tidy.py" (substitute* "tidylib/tidy.py"
(("ctypes\\.util\\.find_library\\('tidy'\\)") (("ctypes\\.util\\.find_library\\('tidy'\\)")
(format #f "'~a'" libtidy))) (format #f "'~a'" libtidy)))

3
gnu/packages/radio.scm
View file

@ -1651,8 +1651,7 @@ methods:
"-lncurses")) "-lncurses"))
(substitute* "src/libcw/libcw_pa.c" (substitute* "src/libcw/libcw_pa.c"
(("libpulse-simple.so" all) (("libpulse-simple.so" all)
(string-append (assoc-ref inputs "pulseaudio") (search-input-file inputs "/lib/libpulse-simple.so"))))))))
"/lib/" all))))))))
(home-page "http://unixcw.sourceforge.net/") (home-page "http://unixcw.sourceforge.net/")
(synopsis "Morse code library and programs") (synopsis "Morse code library and programs")
(description (description

2
gnu/packages/rust.scm
View file

@ -509,7 +509,7 @@ safety and thread safety guarantees.")
(("^jemalloc =.*$") "") (("^jemalloc =.*$") "")
(("[[]rust[]]") "\n[rust]\njemalloc=true\n")) (("[[]rust[]]") "\n[rust]\njemalloc=true\n"))
(setenv "JEMALLOC_OVERRIDE" (setenv "JEMALLOC_OVERRIDE"
(string-append (assoc-ref inputs "jemalloc") (search-input-file inputs
"/lib/libjemalloc_pic.a"))))))))))) "/lib/libjemalloc_pic.a")))))))))))
(define-public rust-1.33 (define-public rust-1.33

4
gnu/packages/security-token.scm
View file

@ -303,7 +303,7 @@ website for more information about Yubico and the YubiKey.")
;; configuration file at runtime. ;; configuration file at runtime.
(add-after 'unpack 'set-default-libpcsclite.so.1-path (add-after 'unpack 'set-default-libpcsclite.so.1-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((libpcsclite (string-append (assoc-ref inputs "pcsc-lite") (let ((libpcsclite (search-input-file inputs
"/lib/libpcsclite.so.1"))) "/lib/libpcsclite.so.1")))
(substitute* "configure" (substitute* "configure"
(("DEFAULT_PCSC_PROVIDER=\"libpcsclite\\.so\\.1\"") (("DEFAULT_PCSC_PROVIDER=\"libpcsclite\\.so\\.1\"")
@ -442,7 +442,7 @@ retrieve a YubiKey's serial number, and so forth.")
(("lib = \"libpcsclite\\.so\\.1\";") (("lib = \"libpcsclite\\.so\\.1\";")
(simple-format #f (simple-format #f
"lib = \"~a\";" "lib = \"~a\";"
(string-append (assoc-ref inputs "pcsc-lite") (search-input-file inputs
"/lib/libpcsclite.so.1")))) "/lib/libpcsclite.so.1"))))
#t))))) #t)))))
(inputs (inputs

3
gnu/packages/selinux.scm
View file

@ -329,8 +329,7 @@ based on required access.")
(add-after 'unpack 'set-SEPOL-variable (add-after 'unpack 'set-SEPOL-variable
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "SEPOL" (setenv "SEPOL"
(string-append (assoc-ref inputs "libsepol") (search-input-file inputs "/lib/libsepol.a"))))
"/lib/libsepol.a"))))
(add-after 'unpack 'remove-Werror (add-after 'unpack 'remove-Werror
(lambda _ (lambda _
(substitute* "setup.py" (substitute* "setup.py"

2
gnu/packages/spice.scm
View file

@ -356,7 +356,7 @@ resolution scaling on graphical console window resize.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "tests/setup-softhsm2.sh" (substitute* "tests/setup-softhsm2.sh"
(("\\/usr\\/lib64\\/pkcs11\\/libsofthsm2\\.so") (("\\/usr\\/lib64\\/pkcs11\\/libsofthsm2\\.so")
(string-append (assoc-ref inputs "softhsm") (search-input-file inputs
"/lib/softhsm/libsofthsm2.so")))))))) "/lib/softhsm/libsofthsm2.so"))))))))
(propagated-inputs (propagated-inputs
`(("glib" ,glib) ; Requires: in the pkg-config file `(("glib" ,glib) ; Requires: in the pkg-config file

7
gnu/packages/telephony.scm
View file

@ -894,14 +894,11 @@ Initiation Protocol (SIP) and a multimedia framework.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "os/linux/AudioPulse.cpp" (substitute* "os/linux/AudioPulse.cpp"
(("libpulse\\.so") (("libpulse\\.so")
(string-append (assoc-ref inputs "pulseaudio") (search-input-file inputs "/lib/libpulse.so")))
"/lib/libpulse.so")))
(substitute* '("os/linux/AudioInputALSA.cpp" (substitute* '("os/linux/AudioInputALSA.cpp"
"os/linux/AudioOutputALSA.cpp") "os/linux/AudioOutputALSA.cpp")
(("libasound\\.so") (("libasound\\.so")
(string-append (assoc-ref inputs "alsa-lib") (search-input-file inputs "/lib/libasound.so"))))))))
"/lib/libasound.so")))
#t)))))
(synopsis "VoIP library for Telegram clients") (synopsis "VoIP library for Telegram clients")
(description "A collection of libraries and header files for implementing (description "A collection of libraries and header files for implementing
telephony functionality into custom Telegram clients.") telephony functionality into custom Telegram clients.")