From cc12c638ca104e6afd6bf29743e7531138214d6c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 9 Jul 2025 00:30:40 +0200 Subject: [PATCH 1/2] hostname: default to hostname-debian on linux --- pkgs/top-level/unixtools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index d2d678467c5f..ba613a51ca07 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -126,7 +126,7 @@ let darwin = pkgs.darwin.shell_cmds; }; hostname = { - linux = pkgs.nettools; + linux = pkgs.hostname-debian; darwin = pkgs.darwin.shell_cmds; freebsd = pkgs.freebsd.bin; openbsd = pkgs.openbsd.hostname; From 9b504cfe4b7951b231feb2224dc7ab6766f20316 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 9 Jul 2025 00:32:49 +0200 Subject: [PATCH 2/2] xdg-utils: use hostname per system indirection Fixes the build on darwin. --- pkgs/by-name/xd/xdg-utils/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xd/xdg-utils/package.nix b/pkgs/by-name/xd/xdg-utils/package.nix index 0b26dfd1b128..9c7119cf87b5 100644 --- a/pkgs/by-name/xd/xdg-utils/package.nix +++ b/pkgs/by-name/xd/xdg-utils/package.nix @@ -21,7 +21,7 @@ glib, gnugrep, gnused, - hostname-debian, + hostname, jq, procps, which, @@ -166,7 +166,7 @@ let scripts = [ "bin/xdg-open" ]; interpreter = "${bash}/bin/bash"; inputs = commonDeps ++ [ - hostname-debian + hostname glib.bin "${placeholder "out"}/bin" ]; @@ -206,7 +206,7 @@ let scripts = [ "bin/xdg-screensaver" ]; interpreter = "${bash}/bin/bash"; inputs = commonDeps ++ [ - hostname-debian + hostname perl procps ];