* [bug#70256] [PATCH] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix.
@ 2024-04-07 11:37 Sughosha via Guix-patches via
2024-04-07 12:00 ` [bug#70256] [PATCH v2] " Sughosha via Guix-patches via
2024-04-07 13:13 ` [bug#70256] [PATCH v3] " Sughosha via Guix-patches via
0 siblings, 2 replies; 5+ messages in thread
From: Sughosha via Guix-patches via @ 2024-04-07 11:37 UTC (permalink / raw)
To: 70256; +Cc: Sughosha, Maxim Cournoyer, 宋文武
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#70256] [PATCH v2] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix.
2024-04-07 11:37 [bug#70256] [PATCH] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix Sughosha via Guix-patches via
@ 2024-04-07 12:00 ` Sughosha via Guix-patches via
2024-04-07 13:13 ` [bug#70256] [PATCH v3] " Sughosha via Guix-patches via
1 sibling, 0 replies; 5+ messages in thread
From: Sughosha via Guix-patches via @ 2024-04-07 12:00 UTC (permalink / raw)
To: 70256; +Cc: Sughosha, Maxim Cournoyer, 宋文武
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: Id67cdca7d9edc543a9bcfee4a8ae860acd87d125
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#70256] [PATCH v3] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix.
2024-04-07 11:37 [bug#70256] [PATCH] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix Sughosha via Guix-patches via
2024-04-07 12:00 ` [bug#70256] [PATCH v2] " Sughosha via Guix-patches via
@ 2024-04-07 13:13 ` Sughosha via Guix-patches via
2024-04-15 9:34 ` bug#70256: " Christopher Baines
1 sibling, 1 reply; 5+ messages in thread
From: Sughosha via Guix-patches via @ 2024-04-07 13:13 UTC (permalink / raw)
To: 70256; +Cc: Sughosha, Maxim Cournoyer, 宋文武
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(-)
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
base-commit: 188d18fc47f0d38edfe06e3e5834fa8587bd300b
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#70256: [PATCH v3] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix.
2024-04-07 13:13 ` [bug#70256] [PATCH v3] " Sughosha via Guix-patches via
@ 2024-04-15 9:34 ` Christopher Baines
0 siblings, 0 replies; 5+ messages in thread
From: Christopher Baines @ 2024-04-15 9:34 UTC (permalink / raw)
To: Sughosha via Guix-patches via
Cc: 宋文武, 70256-done, Maxim Cournoyer, Sughosha
[-- Attachment #1: Type: text/plain, Size: 625 bytes --]
Sughosha via Guix-patches via <guix-patches@gnu.org> writes:
> 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(-)
Looks good to me, I've pushed this to master as
8a257582e3366b37ab7651198fc4c8912c520b37.
Chris
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#70256] [PATCH v3] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix.
[not found] <35A69F96-8E2B-4B28-B795-EEF60F346E4F@disroot.org>
@ 2024-04-16 8:10 ` Sughosha via Guix-patches via
0 siblings, 0 replies; 5+ messages in thread
From: Sughosha via Guix-patches via @ 2024-04-16 8:10 UTC (permalink / raw)
To: 70256
-------- Original Message --------
From: Sughosha <sughosha@disroot.org>
Sent: 16 April 2024 1:31:05 pm IST
To: Christopher Baines <mail@cbaines.net>
Subject: Re: [bug#70256] [PATCH v3] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix.
On 15 April 2024 3:04:53 pm IST, Christopher Baines <mail@cbaines.net> wrote:
>Sughosha via Guix-patches via <guix-patches@gnu.org> writes:
>
>> 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(-)
>
>Looks good to me, I've pushed this to master as
>8a257582e3366b37ab7651198fc4c8912c520b37.
>
>Chris
Thanks for pushing, but it seems that you did not push the v3 patch, which should install the signon library in /lib/signon instead of installing in /lib.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-16 8:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-07 11:37 [bug#70256] [PATCH] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix Sughosha via Guix-patches via
2024-04-07 12:00 ` [bug#70256] [PATCH v2] " 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
[not found] <35A69F96-8E2B-4B28-B795-EEF60F346E4F@disroot.org>
2024-04-16 8:10 ` [bug#70256] " Sughosha via Guix-patches via
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).