From patchwork Sun Apr 7 11:37:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 62812 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 D123327BBE2; Sun, 7 Apr 2024 12:39:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AFBD027BBE9 for ; Sun, 7 Apr 2024 12:39:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtQrW-0001Gz-0Z; Sun, 07 Apr 2024 07:39:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rtQrS-0001Gf-De for guix-patches@gnu.org; Sun, 07 Apr 2024 07:38:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rtQrR-0007rq-A0 for guix-patches@gnu.org; Sun, 07 Apr 2024 07:38:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rtQrW-0000bM-Ab; Sun, 07 Apr 2024 07:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70256] [PATCH] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 07 Apr 2024 11:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70256 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70256@debbugs.gnu.org Cc: Sughosha , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by submit@debbugs.gnu.org id=B.17124899062110 (code B ref -1); Sun, 07 Apr 2024 11:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Apr 2024 11:38:26 +0000 Received: from localhost ([127.0.0.1]:41714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtQqv-0000Xy-Mx for submit@debbugs.gnu.org; Sun, 07 Apr 2024 07:38:25 -0400 Received: from lists.gnu.org ([2001:470:142::17]:41912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtQqt-0000XD-Qb for submit@debbugs.gnu.org; Sun, 07 Apr 2024 07:38:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rtQqh-0001Cg-IV for guix-patches@gnu.org; Sun, 07 Apr 2024 07:38:11 -0400 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rtQqf-0007kD-9V for guix-patches@gnu.org; Sun, 07 Apr 2024 07:38:11 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 02A7A41A0E; Sun, 7 Apr 2024 13:38:07 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TOQSl1I8-mCE; Sun, 7 Apr 2024 13:38:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1712489886; bh=3wkydXyGEAOgFAdmhjKzIWP4LPacGozN8Xepq1cvpRo=; h=From:To:Cc:Subject:Date; b=EtkOUcgFOyWCj3e+Yk0t1hKhjMk/69S18vDHNf0RI/0R6MJPyJ5rfKIa89CcotzcH jL1SNCXQS73W9Hz3Z8uCfYjSjDJvAB9wg8ByON/kOdT0TNACKGdNrsfFZyfF0KhIyS 46cSt6eStMNb1/S9c8irK44RGxQHrHOdlg/eZAOTNTp5LQCbpBnX6BA9NCejwrDWxH ke+9rTZRpkNe7jw8/xzqLLV1eAPtMJWdN9Ro4SBpdzs7UBa3CgV3gA/RrPG+oI9lvu NB8pRhnmsd4vsyGyZe9DzogKPuVHHXlSE+JENAiwfyQprHUNdJdTKiUh0e8M3BSk08 zpLCZvsVUS/aw== Date: Sun, 7 Apr 2024 17:07:30 +0530 Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=sughosha@disroot.org; helo=layka.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This commit fixes creating one more /gnu/store/ directory inside its own prefix, creating again the same prefix inside it and then installing in it. * gnu/packages/qt.scm (signon-plugin-oauth2)[arguments]: <#:make-flags>: Remove argument. <#:phases>: In configure phase, add SIGNON_PLUGINS_DIR variable. Change-Id: I10e973980228354c9943741dd480544bffca65b8 --- gnu/packages/qt.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) base-commit: 188d18fc47f0d38edfe06e3e5834fa8587bd300b diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1440c6981c..19185c3f6a 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -5327,7 +5327,6 @@ (define-public signon-plugin-oauth2 (inputs (list signond)) (arguments (list #:tests? #f ;no tests - #:make-flags #~(list (string-append "INSTALL_ROOT=" #$output)) #:phases #~(modify-phases %standard-phases (replace 'configure @@ -5337,7 +5336,9 @@ (define-public signon-plugin-oauth2 "")) (invoke "qmake" (string-append "PREFIX=" #$output) - (string-append "LIBDIR=" #$output "/lib"))))))) + (string-append "LIBDIR=" #$output "/lib") + (string-append "SIGNON_PLUGINS_DIR=" #$output + "/lib"))))))) (synopsis "OAuth 2 plugin for signon") (description "This plugin for the Accounts-SSO SignOn daemon handles the OAuth