From patchwork Sun Apr 7 13:13:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 62816 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 94CC827BBE2; Sun, 7 Apr 2024 14:15:14 +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 B3BCB27BBE9 for ; Sun, 7 Apr 2024 14:15:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtSMS-0004Ag-Fs; Sun, 07 Apr 2024 09:15:04 -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 1rtSMM-00049m-6c for guix-patches@gnu.org; Sun, 07 Apr 2024 09:14:58 -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 1rtSML-0007Lg-SR for guix-patches@gnu.org; Sun, 07 Apr 2024 09:14:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rtSMP-0000aI-KX; Sun, 07 Apr 2024 09:15:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70256] [PATCH v3] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix. References: In-Reply-To: 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 13:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 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-Xcc: Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 70256-submit@debbugs.gnu.org id=B70256.17124956622007 (code B ref 70256); Sun, 07 Apr 2024 13:15:01 +0000 Received: (at 70256) by debbugs.gnu.org; 7 Apr 2024 13:14:22 +0000 Received: from localhost ([127.0.0.1]:41829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtSLm-0000WJ-DT for submit@debbugs.gnu.org; Sun, 07 Apr 2024 09:14:22 -0400 Received: from layka.disroot.org ([178.21.23.139]:36340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtSLi-0000Vc-Mu for 70256@debbugs.gnu.org; Sun, 07 Apr 2024 09:14:20 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 844D44172A; Sun, 7 Apr 2024 15:14:10 +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 n1WdeEk1GEKu; Sun, 7 Apr 2024 15:14:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1712495649; bh=vqgaJgvxVyaalqv9h1N5l6UH1xR85Ltt52sfvHqKi7Q=; h=From:To:Cc:Subject:Date; b=LZ3olQKWNgxP7AC3TDuK+B9QB6ciisxNNp0UKwv9+9BccJBgPZOIuxRClKYhPffmS S6JuuNYNanNGkIn4ZP1tqWjCSdeY5kyUe+GUKIrbkjSMdbRnFIOoWnHOoDpmc+pPhP QwdNzjabPrQ9owBgycjQy2ROSwYMc050vmWWumWgT4QRlYZ6AbhzmkN0ijChWjQpIe Woni3dYbMR6Q3aTsUziuvIIvTEmu7wMIamPqZSridw1kxyJPcVQY4rEYBJ4j11gJ63 Unr9tCv/p30tIRW15dcAJ8kYNdB/gNyMHXiIJ2YFcFL7McOrkr8Bixrbu8i9wfA6fV 9OxTp9UOFR5jw== Date: Sun, 7 Apr 2024 18:43:50 +0530 Message-ID: <39f79b5440b54301d610ec1240a8ad5e3bef3e71.1712495595.git.sughosha@disroot.org> 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: , 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: Ie7694690c320a95fd9bcc02cb39cd64007f0e979 --- 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..4a4f6b285d 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/signon"))))))) (synopsis "OAuth 2 plugin for signon") (description "This plugin for the Accounts-SSO SignOn daemon handles the OAuth