* [PATCH nixpkgs] chromiumOSPackages.libqmi: don't enable doc twice
@ 2021-08-12 9:31 Alyssa Ross
2021-08-13 15:58 ` Cole Helbling
0 siblings, 1 reply; 3+ messages in thread
From: Alyssa Ross @ 2021-08-12 9:31 UTC (permalink / raw)
To: devel
This is already enabled in the original derivation, so overriding it
to add it here just means we end up passing the option twice.
---
pkgs/os-specific/linux/chromium-os/libqmi/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/os-specific/linux/chromium-os/libqmi/default.nix b/pkgs/os-specific/linux/chromium-os/libqmi/default.nix
index b96b5224b57..7328642d0b4 100644
--- a/pkgs/os-specific/linux/chromium-os/libqmi/default.nix
+++ b/pkgs/os-specific/linux/chromium-os/libqmi/default.nix
@@ -15,7 +15,7 @@ libqmi.overrideAttrs (
# ModemManager tests fail with QRTR in Chromium OS 91.
# Will hopefully be fixed in CrOS 92.
- configureFlags = configureFlags ++ [ "--enable-gtk-doc" "--disable-qrtr" ];
+ configureFlags = configureFlags ++ [ "--disable-qrtr" ];
passthru = passthru // {
updateScript = ../update.py;
--
2.32.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH nixpkgs] chromiumOSPackages.libqmi: don't enable doc twice
2021-08-12 9:31 [PATCH nixpkgs] chromiumOSPackages.libqmi: don't enable doc twice Alyssa Ross
@ 2021-08-13 15:58 ` Cole Helbling
2021-08-16 8:49 ` Alyssa Ross
0 siblings, 1 reply; 3+ messages in thread
From: Cole Helbling @ 2021-08-13 15:58 UTC (permalink / raw)
To: Alyssa Ross, devel
On Thu Aug 12, 2021 at 2:31 AM PDT, Alyssa Ross wrote:
> This is already enabled in the original derivation, so overriding it
> to add it here just means we end up passing the option twice.
> ---
> pkgs/os-specific/linux/chromium-os/libqmi/default.nix | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/pkgs/os-specific/linux/chromium-os/libqmi/default.nix b/pkgs/os-specific/linux/chromium-os/libqmi/default.nix
> index b96b5224b57..7328642d0b4 100644
> --- a/pkgs/os-specific/linux/chromium-os/libqmi/default.nix
> +++ b/pkgs/os-specific/linux/chromium-os/libqmi/default.nix
> @@ -15,7 +15,7 @@ libqmi.overrideAttrs (
>
> # ModemManager tests fail with QRTR in Chromium OS 91.
> # Will hopefully be fixed in CrOS 92.
> - configureFlags = configureFlags ++ [ "--enable-gtk-doc" "--disable-qrtr" ];
> + configureFlags = configureFlags ++ [ "--disable-qrtr" ];
>
> passthru = passthru // {
> updateScript = ../update.py;
> --
> 2.32.0
But what if we want twice the amount of documentation?
Joking aside, LGTM.
Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH nixpkgs] chromiumOSPackages.libqmi: don't enable doc twice
2021-08-13 15:58 ` Cole Helbling
@ 2021-08-16 8:49 ` Alyssa Ross
0 siblings, 0 replies; 3+ messages in thread
From: Alyssa Ross @ 2021-08-16 8:49 UTC (permalink / raw)
To: Cole Helbling; +Cc: devel
[-- Attachment #1: Type: text/plain, Size: 1292 bytes --]
"Cole Helbling" <cole.e.helbling@outlook.com> writes:
> On Thu Aug 12, 2021 at 2:31 AM PDT, Alyssa Ross wrote:
>> This is already enabled in the original derivation, so overriding it
>> to add it here just means we end up passing the option twice.
>> ---
>> pkgs/os-specific/linux/chromium-os/libqmi/default.nix | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/pkgs/os-specific/linux/chromium-os/libqmi/default.nix b/pkgs/os-specific/linux/chromium-os/libqmi/default.nix
>> index b96b5224b57..7328642d0b4 100644
>> --- a/pkgs/os-specific/linux/chromium-os/libqmi/default.nix
>> +++ b/pkgs/os-specific/linux/chromium-os/libqmi/default.nix
>> @@ -15,7 +15,7 @@ libqmi.overrideAttrs (
>>
>> # ModemManager tests fail with QRTR in Chromium OS 91.
>> # Will hopefully be fixed in CrOS 92.
>> - configureFlags = configureFlags ++ [ "--enable-gtk-doc" "--disable-qrtr" ];
>> + configureFlags = configureFlags ++ [ "--disable-qrtr" ];
>>
>> passthru = passthru // {
>> updateScript = ../update.py;
>> --
>> 2.32.0
>
> But what if we want twice the amount of documentation?
>
> Joking aside, LGTM.
>
> Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
Thanks for the review! Pushed as cec682e0071.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-16 8:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-12 9:31 [PATCH nixpkgs] chromiumOSPackages.libqmi: don't enable doc twice Alyssa Ross
2021-08-13 15:58 ` Cole Helbling
2021-08-16 8:49 ` Alyssa Ross
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
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 NNTP newsgroup(s).