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 AAA9875BE3; Tue, 27 Sep 2022 12:33:50 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 3368775BCA; Tue, 27 Sep 2022 12:33:48 +0000 (UTC) Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by atuin.qyliss.net (Postfix) with ESMTPS id C8CC775B30 for ; Tue, 27 Sep 2022 12:33:44 +0000 (UTC) Received: by mail-lj1-x22b.google.com with SMTP id h3so10787851lja.1 for ; Tue, 27 Sep 2022 05:33:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unikie.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=38LifKfAbYpKi5oyB5rYh3ep+e8MHi8KDdeQshsTLa8=; b=cTDNwQ07R693UjhzW/XSaLU1cYpg8ydJkemkgfOMzalgXzOHhzAjkgdaredqAdd7jk +UNYu12QTqEDY7tNEcs9xc0wdTAlcXlPFxp4FmnkrmYj85GWj9Ub3bWoWrI8SmwQlrIs m/467FRfljjnIftVBXdZro9XdibwHzS4NcMq8QjJHMSnE6PHGkbT3+S8cE6AB1EJ9sG0 47xPBwIGy02tIf/ZSN3/k4JYySzGqcBX09Z7dpbkjFGeOCj0B/1YOgA9+ZtncbPfKrWe gXgMa8WKTJl1Szf08hqIXWUGHWhNBALfj6B+quAo2PTqFAy+ArL5TTyYioGVxG9GbUop zr5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=38LifKfAbYpKi5oyB5rYh3ep+e8MHi8KDdeQshsTLa8=; b=7YrIrJlwuDaREvjjEwaZDtLGuo9lbUb8zoNUziIfRWIYntnZKRRR8017BC57+JH3Cf P2bBGUuRWs6I4pK6BlhelGbrIcmMUecdtIwIq5ruhU26QDmK4WZgj+FIPC/QkbCd0DQQ IZLygOt6Ub38NEsNpy6WDgjkx72NFetuohqNUx4f1iEcHGjVUu7SvcGP2A2v1CkarKqj KxSdwXbS9P8j2mDyxJWLJltTkGnf4XXKqECAlSMCWrrrl1zSRR7sYLJHVgVc3+gBT7HC 53ZyF2Io95qthpzGTSCYyOa55kwh7MsuHsPZa4S50s1F5MeBW4ujYvKgzubajWxxZox4 qo2Q== X-Gm-Message-State: ACrzQf1vQphO/meJjyfcQbzUUJ9NdJJupuymOUugFDFjUtwwKQudwr4U 0mPPDzyl8IpuTbfa9Lz5/lMbQy/CvjFk3pkqfPU= X-Google-Smtp-Source: AMsMyM52snn6OSc942unffoRi69eEmsLWH13HIixSBXQ21xW6vcmjMF71eCrQbPkP27ne4RC1l3trQ== X-Received: by 2002:a05:651c:1694:b0:26c:5624:6d37 with SMTP id bd20-20020a05651c169400b0026c56246d37mr9527304ljb.500.1664282023861; Tue, 27 Sep 2022 05:33:43 -0700 (PDT) Received: from yuriy-ThinkPad-P14s-Gen-2a.. ([109.204.204.138]) by smtp.gmail.com with ESMTPSA id u14-20020a2eb80e000000b0026c0f6be5dasm149230ljo.116.2022.09.27.05.33.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Sep 2022 05:33:43 -0700 (PDT) From: Yuri Nesterov To: devel@spectrum-os.org Subject: [PATCH] img/live: use callPackage function instead of "with pkgs;" Date: Tue, 27 Sep 2022 15:33:18 +0300 Message-Id: <20220927123318.2531867-1-yuriy.nesterov@unikie.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 34ZZL3IXP57H5TQNAKUOKAZYDIZFAE2O X-Message-ID-Hash: 34ZZL3IXP57H5TQNAKUOKAZYDIZFAE2O X-MailFrom: yuriy.nesterov@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: Yuri Nesterov 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: When cross compiling Spectrum OS for aarch64 it tries to run aarch64 binaries on x64 host. To fix this issue it is possible to add pkgsBuildHost prefix to all native build inputs. However, a better option would probably be to use callPackage function. With that change it is able to automatically select correct packages. Signed-off-by: Yuri Nesterov --- img/live/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/img/live/default.nix b/img/live/default.nix index 5461384..1fa8da3 100644 --- a/img/live/default.nix +++ b/img/live/default.nix @@ -1,7 +1,11 @@ # SPDX-License-Identifier: MIT # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross +# SPDX-FileCopyrightText: 2022 Unikie -{ config ? import ../../nix/eval-config.nix {} }: +{ config ? import ../../nix/eval-config.nix {} }: config.pkgs.callPackage ( + +{ stdenvNoCC, cryptsetup, dosfstools, jq, mtools, util-linux, stdenv +, systemd }: let inherit (config) pkgs; @@ -15,8 +19,6 @@ let initramfs = import ../../host/initramfs { inherit config rootfs; }; in -with pkgs; - stdenvNoCC.mkDerivation { name = "spectrum-live.img"; @@ -48,3 +50,4 @@ stdenvNoCC.mkDerivation { passthru = { inherit rootfs; }; } +) {} -- 2.34.1