From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Cc: colbyt <colby@colbyt.com>
Subject: [RFC PATCH 3/3] xorg.lndir -> lndir
Date: Wed, 8 Jul 2026 17:44:46 +0200 [thread overview]
Message-ID: <20260708154446.678976-1-hi@alyssa.is> (raw)
In-Reply-To: <20260708154315.678807-1-hi@alyssa.is>
Renamed in Nixpkgs.
Signed-off-by: Alyssa Ross <hi@alyssa.is>
---
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
prev parent reply other threads:[~2026-07-08 15:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-08 15:43 [RFC PATCH 0/3] lib/nixpkgs.default.nix: update to master Alyssa Ross
2026-07-08 15:43 ` [RFC PATCH 1/3] " Alyssa Ross
2026-07-10 10:28 ` Alyssa Ross
2026-07-11 18:33 ` Alyssa Ross
2026-07-08 15:43 ` [RFC PATCH 2/3] Documentation: update Cloud Hypervisor GPU outlook Alyssa Ross
2026-07-08 15:44 ` Alyssa Ross [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260708154446.678976-1-hi@alyssa.is \
--to=hi@alyssa.is \
--cc=colby@colbyt.com \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).