From patchwork Sun Jul 7 19:28:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 14499 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 34914171C5; Sun, 7 Jul 2019 20:30:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D39C21716C for ; Sun, 7 Jul 2019 20:30:15 +0100 (BST) Received: from localhost ([::1]:36694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrX-0004L8-BZ for patchwork@mira.cbaines.net; Sun, 07 Jul 2019 15:30:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48885) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrP-0004HQ-AR for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkCrO-0008Mk-6t for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48631) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkCrO-0008MQ-0i for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkCrN-0005Rd-Rv for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36542] [PATCH 5/6] gnu: network-manager-openvpn: Patch hardcoded paths. Resent-From: Jelle Licht Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jul 2019 19:30:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36542 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36542@debbugs.gnu.org Received: via spool by 36542-submit@debbugs.gnu.org id=B36542.156252775720800 (code B ref 36542); Sun, 07 Jul 2019 19:30:05 +0000 Received: (at 36542) by debbugs.gnu.org; 7 Jul 2019 19:29:17 +0000 Received: from localhost ([127.0.0.1]:57446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqb-0005PL-Eo for submit@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:17 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:48244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqZ-0005P3-7g for 36542@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:15 -0400 From: Jelle Licht Date: Sun, 7 Jul 2019 21:28:47 +0200 Message-Id: <20190707192848.10049-5-jlicht@fsfe.org> In-Reply-To: <20190707192848.10049-1-jlicht@fsfe.org> References: <20190707192848.10049-1-jlicht@fsfe.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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/gnome.scm (network-manager-openvpn)[arguments]: Add custom 'patch-path' phase to replace references to openvpn and modprobe. [inputs]: Add kmod. --- gnu/packages/gnome.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index df273d4dad..b68aed804f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2019 Florian Pelz ;;; Copyright © 2019 Giacomo Leidi +;;; Copyright © 2019 Jelle Licht ;;; ;;; This file is part of GNU Guix. ;;; @@ -5448,12 +5449,31 @@ services.") "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var"))) + `(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var") + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-path + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + (let* ((ovpn (string-append (assoc-ref inputs "openvpn") + "/sbin/openvpn")) + (modprobe (string-append (assoc-ref inputs "kmod") + "/bin/modprobe")) + (pretty-ovpn (string-append "\"" ovpn "\""))) + (for-each + (lambda (file) + (substitute* file + (("\"/usr/local/sbin/openvpn\"") pretty-ovpn) + (("\"/usr/sbin/openvpn\"") pretty-ovpn) + (("\"/sbin/openvpn\"") pretty-ovpn) + (("/sbin/modprobe") modprobe))) + '("src/nm-openvpn-service.c" "properties/nm-openvpn-editor.c"))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs `(("gtk+" ,gtk+) + ("kmod" ,kmod) ("openvpn" ,openvpn) ("network-manager" ,network-manager) ("network-manager-applet" ,network-manager-applet) ;for libnma