From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id CA6117CD18; Wed, 28 Sep 2022 17:01:50 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id C5A7F7CBC2; Wed, 28 Sep 2022 17:01:42 +0000 (UTC) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by atuin.qyliss.net (Postfix) with ESMTPS id 1438E7CBB8 for ; Wed, 28 Sep 2022 17:01:40 +0000 (UTC) Received: by mail-ed1-x52f.google.com with SMTP id u24so3405118edb.11 for ; Wed, 28 Sep 2022 10:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unikie.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=1MFdTSAwx5UL/v7AZGhkVFJlVCpi/y22sQYSgIrfoCQ=; b=CkB2RNVtgMb6jDO4UjQjjInisHOmDFnRzUT2qMdFuAWqvw45ESq6F3F3Jgw0W6BMmJ wdGP7vncQos/7M+/rzJCHOMegwNrLk+hrR2edPYGF4B0Mg3nqMQ17j/5uhCQHlZJDyZB kcpNGPS2EPoipZCirvpWRUPdRmBBmUOcuxrrjcpMqvdInHFLHaotHHzqehZtsGLIkg8Y 0Hs4uICubRURrqioKCLt946PG+XpUUNl/gDAkNNKT5M1xJDfrvqpBP7wnIaEUBfdlzYh Q1GJt/BW7VBAe/IIdhLKpaTd1Og51HTvG8C9uw4ucrhWbDRJvCnrk9dncw4i3VRIfbhc 2xlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=1MFdTSAwx5UL/v7AZGhkVFJlVCpi/y22sQYSgIrfoCQ=; b=trjkKeqa2efkiYsyLHfDCvgaw3uL1ZqiFQ1sDI42Hk1ZhOj0g9GqrNAfdYwvK5kRbW YALq4sKReYPUIyUPChTPhptXqrgzOAH2s+RhNWytat2cFp3s0q2aFc/UCEvWM0L5Yrq6 97NLj+oGpa0t9JBWAZetl9IckD1m2zteJf+dk8zZSJujXfGxhjiCKfrH2i/EgkS91CF0 wAdEQXljzmto7gtBnF1QUQmtN8jKR4hRaCIZTOKWSJAuocCI+OZeIxWayGjlGEZv2FDD Cf/UZqj5NZx/x24sio+UvBPz1Ho2qYzDl+qVAnncjUyuUblFdA4T30rCW3slu9LdRDJM lbXw== X-Gm-Message-State: ACrzQf3pZav0LsgmfoccxgfJuXb7h0wRio4pHMgP/MVVOf9DouxO9FVY VFIi9WZNtpRNOILRwbezK3kkHbMftTp2qUuN X-Google-Smtp-Source: AMsMyM6DTElWbPciNF+huOXaXCtpLP5mBivJUWgbIHUf//fBGmdSKeOMx5UHjBUSIpOuu0+KBAPl3g== X-Received: by 2002:aa7:c849:0:b0:453:9543:6ef3 with SMTP id g9-20020aa7c849000000b0045395436ef3mr34662844edt.105.1664384499672; Wed, 28 Sep 2022 10:01:39 -0700 (PDT) Received: from x220.qyliss.net (p4feb786f.dip0.t-ipconnect.de. [79.235.120.111]) by smtp.gmail.com with ESMTPSA id n15-20020aa7db4f000000b00457d3bec44csm2492679edt.0.2022.09.28.10.01.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 10:01:38 -0700 (PDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id E34FA2E9; Wed, 28 Sep 2022 17:01:37 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [RFC PATCH nixpkgs 6/9] rustPlatform: forward unpack hooks to cargo fetch Date: Wed, 28 Sep 2022 17:01:25 +0000 Message-Id: <20220928170128.1583791-7-alyssa.ross@unikie.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220928170128.1583791-1-alyssa.ross@unikie.com> References: <20220928170128.1583791-1-alyssa.ross@unikie.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: SQJNXQVQX76BJYSKJLLTMQVHKFU6GALK X-Message-ID-Hash: SQJNXQVQX76BJYSKJLLTMQVHKFU6GALK X-MailFrom: alyssa.ross@unikie.com X-Mailman-Rule-Hits: header-match-devel.spectrum-os.org-0 X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1 CC: Ville Ilvonen X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Sometimes it's more ergonomic to set up the build environment in hooks, to add to the default behaviour rather than replacing it. It's very surprising that the fetcher works fine with a custom unpackPhase, but not with custom preUnpack or postUnpack. Signed-off-by: Alyssa Ross --- pkgs/build-support/rust/build-rust-package/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index db0d2c53bb1..c35f906ba08 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -22,7 +22,9 @@ , src ? null , srcs ? null +, preUnpack ? null , unpackPhase ? null +, postUnpack ? null , cargoPatches ? [] , patches ? [] , sourceRoot ? null @@ -63,7 +65,7 @@ let if cargoVendorDir != null then null else if cargoLock != null then importCargoLock cargoLock else fetchCargoTarball ({ - inherit src srcs sourceRoot unpackPhase cargoUpdateHook; + inherit src srcs sourceRoot preUnpack unpackPhase postUnpack cargoUpdateHook; name = cargoDepsName; patches = cargoPatches; } // lib.optionalAttrs (args ? cargoHash) { -- 2.37.1