From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Subject: [PATCH] gnu: ffmpeg: Augment rpath of libraries. Date: Fri, 16 Jan 2015 22:26:19 +0800 Message-ID: <1421418379-27494-1-git-send-email-iyzsong@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YC7r3-0008D7-5L for guix-devel@gnu.org; Fri, 16 Jan 2015 09:26:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YC7qz-0006jc-TA for guix-devel@gnu.org; Fri, 16 Jan 2015 09:26:29 -0500 Received: from mail-pa0-x235.google.com ([2607:f8b0:400e:c03::235]:46492) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YC7qz-0006jY-LY for guix-devel@gnu.org; Fri, 16 Jan 2015 09:26:25 -0500 Received: by mail-pa0-f53.google.com with SMTP id kq14so24505048pab.12 for ; Fri, 16 Jan 2015 06:26:24 -0800 (PST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * gnu/packages/video.scm (ffmpeg)[arguments][add-lib-to-run-path]: Add $out/lib to the RUNPATH of libraries. --- gnu/packages/video.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2febd12..1b15577 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -184,10 +184,11 @@ (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib"))) - ;; Add LIB to the RUNPATH of all the executables. + ;; Add LIB to the RUNPATH of all the executables and libraries. (with-directory-excursion out (for-each (cut augment-rpath <> lib) - (find-files "bin" ".*"))))) + (append (find-files "bin" ".*") + (find-files "lib" "so\\..*\\.")))))) %standard-phases)))) (home-page "http://www.ffmpeg.org/") (synopsis "Audio and video framework") -- 2.1.2