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,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.5 Received: by atuin.qyliss.net (Postfix, from userid 496) id 810D74EE10; Wed, 30 Jun 2021 09:20:50 +0000 (UTC) Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 8D2064ECE3; Wed, 30 Jun 2021 09:20:35 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 8103C4ED1D; Wed, 30 Jun 2021 09:20:33 +0000 (UTC) Received: from forward4-smtp.messagingengine.com (forward4-smtp.messagingengine.com [66.111.4.238]) by atuin.qyliss.net (Postfix) with ESMTPS id 51E9A4ED18 for ; Wed, 30 Jun 2021 09:20:31 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailforward.nyi.internal (Postfix) with ESMTP id 8B1A61940A2F for ; Wed, 30 Jun 2021 05:20:30 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 30 Jun 2021 05:20:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding: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=3mBX9ohLKYvOnqml2zqSJKOgcxNGmEyJKYpqp4K1mYY=; b=GNvvFPJ+ ZtADSWf2UlAVVg406lTPjU1OpF4Lk6umj/dPI5fwYdpnUDkYtc+EhEQtbRhcqfMB y6242R/I78642X/wOQDjSvimJG/CM7Il58S+W0hkMZbnUefFc7LC6ornPdKUKP9b 0VaoNmwYoeUBCeXFJ3SshLzqLzP3ULyKfz0Ix9IWaiwB2lEsVBQDd8WyCiXSDgaj vZkYMhCAykJbhKg6PgUcV5qBduruCzoas9OkzY7g4dwJLee8i28cEf2QRZ8KwreZ t5qNF36FjI/4IxGd/CW3Z3I2748yycH8xWPF8znNQ1hshBj2UU/wXX5xg7AIZHe7 3LxAjvGEgVWZpQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrfeeivddgudegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepgfefudekvdelieelledufeevheeglefggedvudejvd dtffeuueevffehleejkedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepqhihlhhishhssegvvhgvrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Wed, 30 Jun 2021 05:20:30 -0400 (EDT) Received: by eve.qyliss.net (Postfix, from userid 1000) id 66084FFB; Wed, 30 Jun 2021 09:20:28 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs 1/2] chromiumOSPackages.modemmanager-next: fix libqmi Date: Wed, 30 Jun 2021 09:20:20 +0000 Message-Id: <20210630092021.58387-2-hi@alyssa.is> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210630092021.58387-1-hi@alyssa.is> References: <20210630092021.58387-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: NFRG7YYX7LT6K7CO6LJH6LLKTH45QWPD X-Message-ID-Hash: NFRG7YYX7LT6K7CO6LJH6LLKTH45QWPD 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 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: 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