From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Subject: [PATCH nixpkgs 1/2] chromiumOSPackages.modemmanager-next: fix libqmi
Date: Wed, 30 Jun 2021 09:20:20 +0000 [thread overview]
Message-ID: <20210630092021.58387-2-hi@alyssa.is> (raw)
In-Reply-To: <20210630092021.58387-1-hi@alyssa.is>
We need to remove the upstream version, to replace it here with the
CrOS version, and also we need to provide the CrOS version as a build
input, not a native build input.
---
.../linux/chromium-os/modem-manager/next.nix | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix b/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix
index d40b2c9292e..a2239a0b9c8 100644
--- a/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix
+++ b/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix
@@ -3,7 +3,12 @@
}:
modemmanager.overrideAttrs (
- { pname, nativeBuildInputs ? [], passthru ? {}, meta ? {}, ... }:
+ { pname
+ , nativeBuildInputs ? [], buildInputs ? []
+ , passthru ? {}, meta ? {}
+ , ...
+ }:
+
{
pname = "${pname}-chromiumos-next-unstable";
version = "2019-10-17";
@@ -12,7 +17,10 @@ modemmanager.overrideAttrs (
upstreamInfo.components."src/third_party/modemmanager-next";
nativeBuildInputs = nativeBuildInputs ++
- [ autoreconfHook autoconf-archive libqmi libxslt ];
+ [ autoreconfHook autoconf-archive libxslt ];
+
+ buildInputs = [ libqmi ]
+ ++ lib.filter (x: x ? pname && x.pname != "libqmi") buildInputs;
passthru = passthru // {
updateScript = ../update.py;
--
2.31.1
next prev parent reply other threads:[~2021-06-30 9:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-30 9:20 [PATCH nixpkgs 0/2] Pre-merge fixes for Nixpkgs update Alyssa Ross
2021-06-30 9:20 ` Alyssa Ross [this message]
2021-06-30 15:32 ` [PATCH nixpkgs 1/2] chromiumOSPackages.modemmanager-next: fix libqmi Cole Helbling
2021-07-01 8:59 ` Alyssa Ross
2021-06-30 9:20 ` [PATCH nixpkgs 2/2] spectrumPackages.sys-vms.comp: don't pin Emacs Alyssa Ross
2021-06-30 15:34 ` Cole Helbling
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210630092021.58387-2-hi@alyssa.is \
--to=hi@alyssa.is \
--cc=devel@spectrum-os.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://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).