unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Sughosha via Guix-patches via <guix-patches@gnu.org>
To: 70256@debbugs.gnu.org
Cc: Sughosha <sughosha@disroot.org>,
	"Maxim Cournoyer" <maxim.cournoyer@gmail.com>,
	宋文武 <iyzsong@envs.net>
Subject: [bug#70256] [PATCH] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix.
Date: Sun,  7 Apr 2024 17:07:30 +0530	[thread overview]
Message-ID: <c8ef5a9e6e6a641b2400c02b1dcef49d9f393ec0.1712489842.git.sughosha@disroot.org> (raw)

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(-)

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

base-commit: 188d18fc47f0d38edfe06e3e5834fa8587bd300b
-- 
2.41.0





             reply	other threads:[~2024-04-07 11:39 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-07 11:37 Sughosha via Guix-patches via [this message]
2024-04-07 12:00 ` [bug#70256] [PATCH v2] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix Sughosha via Guix-patches via
2024-04-07 13:13 ` [bug#70256] [PATCH v3] " Sughosha via Guix-patches via
2024-04-15  9:34   ` bug#70256: " Christopher Baines

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c8ef5a9e6e6a641b2400c02b1dcef49d9f393ec0.1712489842.git.sughosha@disroot.org \
    --to=guix-patches@gnu.org \
    --cc=70256@debbugs.gnu.org \
    --cc=iyzsong@envs.net \
    --cc=maxim.cournoyer@gmail.com \
    --cc=sughosha@disroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).