From patchwork Thu Jun 25 13:46:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 22860 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 9D60B27BBE3; Thu, 25 Jun 2020 14:49:12 +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 C726B27BBE1 for ; Thu, 25 Jun 2020 14:49:11 +0100 (BST) Received: from localhost ([::1]:42204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joSFb-0004wg-9B for patchwork@mira.cbaines.net; Thu, 25 Jun 2020 09:49:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joSFS-0004vF-Vo for guix-patches@gnu.org; Thu, 25 Jun 2020 09:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1joSFS-0004XW-MP for guix-patches@gnu.org; Thu, 25 Jun 2020 09:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1joSFS-0005Ig-HA for guix-patches@gnu.org; Thu, 25 Jun 2020 09:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42040] [PATCH] gnu: mumble: Fix mumble-overlay. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Jun 2020 13:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42040 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42040@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159309293520353 (code B ref -1); Thu, 25 Jun 2020 13:49:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jun 2020 13:48:55 +0000 Received: from localhost ([127.0.0.1]:39946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1joSFL-0005ID-0e for submit@debbugs.gnu.org; Thu, 25 Jun 2020 09:48:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:40442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1joSFJ-0005I5-F8 for submit@debbugs.gnu.org; Thu, 25 Jun 2020 09:48:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joSFI-0004jw-Sr for guix-patches@gnu.org; Thu, 25 Jun 2020 09:48:53 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:33795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joSFG-0004N7-3V for guix-patches@gnu.org; Thu, 25 Jun 2020 09:48:52 -0400 Received: from localhost.localdomain (193-83-245-58.hdsl.highway.telekom.at [193.83.245.58]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 49t1ZG1bDwz3wHN for ; Thu, 25 Jun 2020 15:48:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1593092918; bh=g/32+/X2jbq2g6y7Y1Q+X2YZlmI2mIwg8wH+4giXFZI=; h=From:To:Subject:Date; b=VafffLuBryVAbPw0DO/5ZNHStVXIV4WTK6UX1GW1C3Sh3n5jwHoDLuUYAVJs5gPKs b6QfO7qOD0g3Vh0WO6hMr2TA3NrvCGNcKLxsMEnZ/fBWOgj7cGsHi9sOY/+VqLH23K igAExwKk/qLwC+s/J/zyW9MYFxINmHzYZto4HyD8= From: Leo Prikler Date: Thu, 25 Jun 2020 15:46:18 +0200 Message-Id: <20200625134618.13491-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 Received-SPF: pass client-ip=129.27.2.202; envelope-from=leo.prikler@student.tugraz.at; helo=mailrelay.tugraz.at X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/25 09:48:39 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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 The canonical mumble-overlay script searches for libmumble.so.1 in various directories, none of which are relevant in Guix installations and additionally does some work to match the architecture of the library to that of the command that will be executed. This work is unnecessary in Guix and only causes the script to fail, so we instead just hardcode the path. * gnu/packages/telephony.scm (mumble)[#:phases]: Add fix-mumble-overlay. --- gnu/packages/telephony.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 4c84ddc85a..542d36a841 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -588,6 +588,16 @@ address of one of the participants.") (substitute* "src/mumble/Settings.cpp" (("bUsage = true;") "bUsage = false;")) #t)) + (add-before 'configure 'fix-mumble-overlay + (lambda* (#:key outputs #:allow-other-keys) + (with-output-to-file "scripts/mumble-overlay" + (lambda () + (format #t "#!~a~%" (which "bash")) + (format #t "export LD_PRELOAD=\"~a $LD_PRELOAD\"~%" + (string-append (assoc-ref outputs "out") + "/lib/mumble/libmumble.so.1")) + (format #t "exec \"${@}\""))) + #t)) (add-before 'install 'disable-murmur-ice (lambda _ (substitute* "scripts/murmur.ini.system"