From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.5 Received: by atuin.qyliss.net (Postfix, from userid 496) id 851974A77; Thu, 1 Jul 2021 08:59:54 +0000 (UTC) Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 019234AB3; Thu, 1 Jul 2021 08:59:46 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 6DA5D4A4A; Thu, 1 Jul 2021 08:59:43 +0000 (UTC) Received: from forward2-smtp.messagingengine.com (forward2-smtp.messagingengine.com [66.111.4.226]) by atuin.qyliss.net (Postfix) with ESMTPS id 3DDC44A49 for ; Thu, 1 Jul 2021 08:59:40 +0000 (UTC) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.nyi.internal (Postfix) with ESMTP id 02D6C19410F0; Thu, 1 Jul 2021 04:59:39 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Thu, 01 Jul 2021 04:59:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=9XIWxF Wza2nHpR5l8rlhPqSCcImMtMxfu4JG1wX5uSc=; b=CbmIpSLTdYToyqNwAWq81c XWMLfhF0IsrpwJj5L3ZixwQc4K2icCzh/Z7iFcqLIe4++8RVPAaQupu7g80xiJmi w/f9etz6eyMqtIAaKrazwI4ZsGFhZAYEXgGzq0K0vNjYi1L6brjqAd0y7ZMGR0w6 BeSQCWmpyYmyHSBcfrSyZzKvQcO/9SJPtDdOVZ5wI0Qe82XeI8qWzqHU8c9q3naa yQpOb3nywO6y6PGkt4oMOPzi+t9ZzY8BDLTKoxMlWthRm5OoPJRnUU7qB7WDNG3a LvP5WNCIJcKfq1YTYJs4v2CzwNXw09gRNS2IKEeAWkb7JypqN+1JcV6kwlAOUAdw == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrfeeiiedguddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtddtredttddvnecuhfhrohhmpeetlhihshhs rgcutfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpeeuff egffdtvdffiedttefggfehtdfgudfhfffgteefgfdugeegveffieffudduvdenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehqhihlihhsshesvg hvvgdrqhihlhhishhsrdhnvght X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 1 Jul 2021 04:59:38 -0400 (EDT) Received: by eve.qyliss.net (Postfix, from userid 1000) id 873701033; Thu, 1 Jul 2021 08:59:35 +0000 (UTC) Date: Thu, 1 Jul 2021 08:59:35 +0000 From: Alyssa Ross To: Cole Helbling Subject: Re: [PATCH nixpkgs 1/2] chromiumOSPackages.modemmanager-next: fix libqmi Message-ID: <20210701085935.xrhhidohyufctx6p@eve.qyliss.net> References: <20210630092021.58387-2-hi@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="5bug3uerkcnodrrh" Content-Disposition: inline In-Reply-To: Message-ID-Hash: 4IW5DLXVYHNOMCFSATGSXGL5IP34F7XT X-Message-ID-Hash: 4IW5DLXVYHNOMCFSATGSXGL5IP34F7XT X-MailFrom: qyliss@eve.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: devel@spectrum-os.org X-Mailman-Version: 3.3.4 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --5bug3uerkcnodrrh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Jun 30, 2021 at 08:32:54AM -0700, Cole Helbling wrote: > On Wed Jun 30, 2021 at 2:20 AM PDT, Alyssa Ross wrote: > > 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; > > Is having two "libqmi"s really that big of a deal? Is there a scenario where > this prevents e.g. mixing versions or something? Seems like it'd be easier to > just `inherit buildInputs` or `buildInputs = buildInputs` (latter for future > extensibility). It just occurred to me that there's a better way of doing this, that prevents any ambiguity about what's happening with libqmi. What do you think about this instead? diff --git c/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix w/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix index d40b2c9292e..17d95c2b3bc 100644 --- c/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix +++ w/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix @@ -2,7 +2,7 @@ , autoconf-archive, libqmi, libxslt }: -modemmanager.overrideAttrs ( +(modemmanager.override { inherit libqmi; }).overrideAttrs ( { pname, nativeBuildInputs ? [], passthru ? {}, meta ? {}, ... }: { pname = "${pname}-chromiumos-next-unstable"; @@ -12,7 +12,7 @@ modemmanager.overrideAttrs ( upstreamInfo.components."src/third_party/modemmanager-next"; nativeBuildInputs = nativeBuildInputs ++ - [ autoreconfHook autoconf-archive libqmi libxslt ]; + [ autoreconfHook autoconf-archive libxslt ]; passthru = passthru // { updateScript = ../update.py; --5bug3uerkcnodrrh Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEH9wgcxqlHM/ARR3h+dvtSFmyccAFAmDdg/UACgkQ+dvtSFmy ccCFThAApDchLy060vrh2BFIhN9kfSLHVkLM7yhtSL9Di0RY9WxzaD9e2YXh2hT7 87FVd8nZeDRqubRkEQ0si4gqq6x1FYsh0ASdbFgCTC2TPBZdIEGqKSKEr7bqLfqa e7KnGGQgAhyTdX50FTuFhn1AybxLtJ9VYr92psUuDWqJkVAFENqZF+nx0Exk7Hbt ueMwPPVxXC5QfkQX4i2uLbsL5OxTI0fQ7MhMjyb9Lj4YHG7s4gu6S9bi36nxq0Aa aZnJJX8vNKj77MexBHD0uG0REvehwgFMoh1uBygXKfxomXT0DjEIjTk7AMc9wQ8I NnLgx1kNRAeIx44NJNIfc6XPshux8ixl0axOjddmDUzgZiqvor9iWtAsdqyOa4/e ZRrZIxM2M33JpU76H6SHS3ED6gPORl0MvWmufolPjeE5tHzfrnQz9AnWp3K+C1Rp Ua4DWor+XWd0n8kBb/4lPJaDH9LsFZ3xgs/iJ8qDPKzCZ5E8KRMUsA2XR/BEOPcn 8Mitud84fekQ7DIlf1evNAZ1/CUTepfvnb9Vwb6UepPkykOvkQhBWDOh0Xnj9Vkm FWcDFR9j+JbaKXUrLWVnKJlCzw4wRrDfMyq0GhIRupxifm4eLZ+rMDLUaNDBTEpM gWYPIR9OGzktE+no9y2a590+8Zt+aq+IA/Wh1okLp8BMFy4Xppg= =un0w -----END PGP SIGNATURE----- --5bug3uerkcnodrrh--