From patchwork Wed Jun 17 10:50:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 22756 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0064427BBE3; Wed, 17 Jun 2020 11:55:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7ADE927BBE1 for ; Wed, 17 Jun 2020 11:55:11 +0100 (BST) Received: from localhost ([::1]:59796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlVip-0000DK-0C for patchwork@mira.cbaines.net; Wed, 17 Jun 2020 06:55:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlVep-0002Fo-KI for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38959) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlVeo-0003H3-2t for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jlVeo-0001c3-1r for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41911] [PATCH 2/5] gnu: k3b: Add inputs for external programs. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jun 2020 10:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41911 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41911@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 41911-submit@debbugs.gnu.org id=B41911.15923910226119 (code B ref 41911); Wed, 17 Jun 2020 10:51:02 +0000 Received: (at 41911) by debbugs.gnu.org; 17 Jun 2020 10:50:22 +0000 Received: from localhost ([127.0.0.1]:50499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlVe9-0001ac-IL for submit@debbugs.gnu.org; Wed, 17 Jun 2020 06:50:21 -0400 Received: from araneo.si ([90.157.193.204]:50812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlVe5-0001Zq-Ib for 41911@debbugs.gnu.org; Wed, 17 Jun 2020 06:50:18 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 10a39633 for <41911@debbugs.gnu.org>; Wed, 17 Jun 2020 10:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=20180623; bh=bEuDxN0g q02iyJaxrQv65xjFFAY=; b=iUKQRiBRfjqfJdl2F/Lb8J/hcgEKKQ7+F5nqk9WQ Pstoc1g3EWCeQfPPbcnK/NNUcj4a7TyGqSa92Whq7Z2wxCKuJZ963SGnf3dQIqRA 0p7R78K1aIcddj9qoSWtLULZh5JLGQ4DPg2x/Cwy9JvL4WgfQPkI4nq5zGV1mrZW PCrCiqqSihn9yP4w7qb3J0A5R0PyXFQNEm7sWawYzc//5Y/qt5x63WIYA9BtIvB2 yAZCGDyTEeQE21nBs53b7AWgLpl6h004+R3G96LxzH2/FFEbGnc6Qc3yw8P+b6OS 7iQsZeY/OFGxyHuRgyiJWCaEVu74/+dnEBAOdfZa0Bqqng== Received: by araneo.si (OpenSMTPD) with ESMTPSA id e379011f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 17 Jun 2020 10:50:12 +0000 (UTC) From: Timotej Lazar Date: Wed, 17 Jun 2020 12:50:05 +0200 Message-Id: <20200617105008.11348-2-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200617105008.11348-1-timotej.lazar@araneo.si> References: <20200617105008.11348-1-timotej.lazar@araneo.si> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kde-multimedia.scm (k3b)[inputs]: Add cdrdao, dvd+rw-tools, libburn and sox. [arguments]<#:phases>[wrap-path]: New phase to wrap the binary with paths to the above. --- gnu/packages/kde-multimedia.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 938251a532..654aecd858 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2019 Hartmut Goebel +;;; Copyright © 2020 Timotej Lazar ;;; ;;; This file is part of GNU Guix. ;;; @@ -296,12 +297,26 @@ This package is part of the KDE multimedia module.") (sha256 (base32 "0r01ninrrmqk7pl5jg0g51fcky1ammw0yyq572wyhibw7q8y7ly7")))) (build-system qt-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'qt-wrap 'wrap-path + (lambda _ + ;; Set paths to backend programs. + (wrap-program (string-append (assoc-ref %outputs "out") "/bin/k3b") + `("PATH" ":" prefix + ,(map (lambda (input) + (string-append (assoc-ref %build-inputs input) "/bin")) + '("cdrdao" "dvd+rw-tools" "libburn" "sox")))) + #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) ("kdoctools" ,kdoctools))) (inputs - `(("ffmpeg" ,ffmpeg) + `(("cdrdao" ,cdrdao) + ("dvd+rw-tools" ,dvd+rw-tools) + ("ffmpeg" ,ffmpeg) ("flac" ,flac) ("karchive" ,karchive) ("kcmutils" ,kcmutils) @@ -319,6 +334,7 @@ This package is part of the KDE multimedia module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("lame" ,lame) + ("libburn" ,libburn) ("libdvdread" ,libdvdread) ;; TODO: LibFuzzer ("libiconv" ,libiconv) @@ -334,6 +350,7 @@ This package is part of the KDE multimedia module.") ("qtwebkit" ,qtwebkit) ("shared-mime-info" ,shared-mime-info) ("solid" ,solid) + ("sox" ,sox) ("taglib" ,taglib))) (home-page "https://kde.org/applications/multimedia/org.kde.k3b") (synopsis "Sophisticated CD/DVD burning application")