From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id D83F22BEA; Wed, 08 Jul 2026 15:45:03 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id A57382C46; Wed, 08 Jul 2026 15:45:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_MISSING,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fhigh-a6-smtp.messagingengine.com (fhigh-a6-smtp.messagingengine.com [103.168.172.157]) by atuin.qyliss.net (Postfix) with ESMTPS id 7C0852C44 for ; Wed, 08 Jul 2026 15:44:59 +0000 (UTC) Received: from phl-compute-10.internal (phl-compute-10.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id B32711400098; Wed, 8 Jul 2026 11:44:58 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-10.internal (MEProxy); Wed, 08 Jul 2026 11:44:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1783525498; x= 1783611898; bh=RN1gseP96W2O7uNfIa2zpWSr2rqR/geDKsYWj0pYUYg=; b=Y q+BqGE6YZ3rznNE0reY+AdnGsRbFXFnFyHcATGJIG4YlGk8tYLKKhEB2JOOIIQxn 8TzGIViiuPCpT/3EgSwOrpC/se/w0UcyleGG453g6yi0E1ZAmQpEbganqSOiZcCI vGUdurkRLxTQ+PllvBLai2D3aHQ2u/LfDjU2bSoNk9UL32oxnH1gkU1tGMcR9eA1 wIMK4T/6YLzqUb1huWNJ7EdkKx79uQVWeLQzgmHlDrLvSvTOnNc4x/1zcoVChbtT Y2SKBCTTTInSdUjwJV/276dfPFtfusWjMIOiGAzHj+zyOu7LJ++NCMIo94VLcz82 7Jx1GdMoRIMFul+7qKdbA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1783525498; x=1783611898; bh=R N1gseP96W2O7uNfIa2zpWSr2rqR/geDKsYWj0pYUYg=; b=VC8rY0YP3rd7i8FZV xOZhVQ53UMxV825m3h5xt4l2NiiJjza1YITnmAjR9/2pMnm+xLpWlPtWBRFM+WHY LW771DLNjKgQqpPDCeoX4PwMXv8CZMusG0mJFY7odJ/+dKJFq/jGETmUyJtPidRd 5EI9KxjTeHpNDKim12ig0fG7oDFVhaoEIrlx1IahNbL5K0PFS0RpRqjWa5T+nxiy JehlF38eDjDQHUg20JHijnCxcGpnX+0XT1mxZ/faa/uY9I4fDlCoXG/ci/PX2Pbm vaXYg6tGVnLwF3SahX7j25yk+ool7JB9ezqMH0hkJ2APVbgBhG4DHD0C1Y9HY4ss /zVnQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTGMSCFM+lahZtSynJ+IxckulgFEP/y7tjBUvbfV9/UtRg2w352cneG1EZAYT92h/D 7qPIlApqoKTL16TG5W3leslro2uKv5xSUQQrDQXOu0uzImGbf7Bjo+5Artme77CEGWtuNu vjLQnP46ptVGV40rBQKTUY/JdlZjC9ld1VJTSxMb45SIHX18pDaXuN9mo2cAeF1ixMYMfL UpcvOOi8ypLP7mIPxmQvNTaz9doc21XhZC6+pM9DXxWJV1ffBX31yHVIJNrFTCX4mKmD5A wJal1bna9Z/ZXdXrVk1U+hIKiZ8jak+omqRQQGb3KAWsTxYmzltwW0Jw9LE3RwBO87E9ak aEDNwAPHMfDZsMsUAQ2wuZJoGMnJW9mSDnYvNfugIRwO3gYWEvLA0CdFsrO90gYejFN/33 nNvt3+F6/iYHllyzVNbW5iejaudBsMgubFarfUT01HgGaBVyJ2et3dBS1JBnmo/0xq9IC1 O/ReBKvG2KH4vFFA+FJ+OUUMvWSmE4D7C2Wm20I9WxyZd43GPFXYRTzGXVzhJTsj+2TFfG 1hJu7cqjLrHYFaDiKWEdvm/CYFVjzktWnLm6IEcyIFRPDuNlOagTAIANzWYtORSITpXOXw jTP6G8uRCvcHPVZBKtw5VjehV5t8QSfyUcvRM+qoe1UdZHvyWIZGYM7c5+JQ X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 8 Jul 2026 11:44:58 -0400 (EDT) Received: by mbp.qyliss.net (Postfix, from userid 1000) id 03E7E889CEBC; Wed, 08 Jul 2026 17:44:57 +0200 (CEST) From: Alyssa Ross To: devel@spectrum-os.org Subject: [RFC PATCH 3/3] xorg.lndir -> lndir Date: Wed, 8 Jul 2026 17:44:46 +0200 Message-ID: <20260708154446.678976-1-hi@alyssa.is> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260708154315.678807-1-hi@alyssa.is> References: <20260708154315.678807-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 4N5BJRJ7YQL7P7LRB5MFRSVOPU2L32CW X-Message-ID-Hash: 4N5BJRJ7YQL7P7LRB5MFRSVOPU2L32CW X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: colbyt X-Mailman-Version: 3.3.10 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Renamed in Nixpkgs. Signed-off-by: Alyssa Ross --- host/rootfs/default.nix | 4 ++-- img/app/default.nix | 4 ++-- vm/sys/net/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index 6bfeefb..a3b02d5 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -4,7 +4,7 @@ import ../../lib/call-package.nix ( { callSpectrumPackage, config, spectrum-build-tools -, src, pkgsMusl, inkscape, linuxPackagesFor, linux_latest, xorg +, src, pkgsMusl, inkscape, lndir, linuxPackagesFor, linux_latest }: pkgsMusl.callPackage ( @@ -76,7 +76,7 @@ let packagesSysroot = runCommand "packages-sysroot" { depsBuildBuild = [ inkscape ]; - nativeBuildInputs = [ xorg.lndir ]; + nativeBuildInputs = [ lndir ]; src = builtins.path { name = "os-release"; path = ./os-release.in; }; } '' mkdir -p $out/usr/bin $out/usr/share/dbus-1/services \ diff --git a/img/app/default.nix b/img/app/default.nix index 0a65793..7261481 100644 --- a/img/app/default.nix +++ b/img/app/default.nix @@ -4,7 +4,7 @@ import ../../lib/call-package.nix ( { spectrum-app-tools, spectrum-build-tools, src, terminfo , lib, appimageTools, buildFHSEnv, runCommand, stdenvNoCC, writeClosure -, erofs-utils, jq, s6-rc, util-linux, xorg +, erofs-utils, jq, lndir, s6-rc, util-linux , cacert, linux_latest }: @@ -88,7 +88,7 @@ let })).fhsenv; packagesSysroot = runCommand "packages-sysroot" { - nativeBuildInputs = [ xorg.lndir ]; + nativeBuildInputs = [ lndir ]; } '' mkdir $out lndir -ignorelinks -silent ${appimageFhsenv} $out diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index 1933c07..b160dad 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -6,7 +6,7 @@ import ../../../lib/call-package.nix ( pkgsMusl.callPackage ( { lib, stdenvNoCC, nixos, runCommand, writeClosure -, erofs-utils, jq, s6-rc, util-linux, xorg +, erofs-utils, jq, lndir, s6-rc, util-linux , busybox, dbus, execline, iwd, kmod, linuxPackagesFor, linux_latest , mdevd, nftables, s6, s6-linux-init, spectrum-driver-tools, xdp-tools }: @@ -80,7 +80,7 @@ let packagesSysroot = runCommand "packages-sysroot" { inherit packages; - nativeBuildInputs = [ xorg.lndir ]; + nativeBuildInputs = [ lndir ]; passAsFile = [ "packages" ]; } '' mkdir -p $out/usr/bin -- 2.54.0