From 4cac65085cd9bc2ed24dd930e665d0d49bcd7052 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 17 Oct 2024 10:32:42 +0100 Subject: [PATCH] procps: fix `watchOnly = true;` build Without the change the build fails as: $ nix build --impure --expr 'with import ./. {}; procps.override { withSystemd = false; watchOnly = true; }' -L ... procps> build flags: -j16 SHELL=.../bash usrbin_execdir=\$\(out\)/bin watch PKG_LDFLAGS= procps> make: *** No rule to make target 'watch'. Stop. While at it dropped unused `PKG_LDFLAGS=` flag. --- pkgs/os-specific/linux/procps-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 6d9bcf9a3a0b..ead3c19a1ae4 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; makeFlags = [ "usrbin_execdir=$(out)/bin" ] - ++ lib.optionals watchOnly [ "watch" "PKG_LDFLAGS=" ]; + ++ lib.optionals watchOnly [ "src/watch" ]; enableParallelBuilding = true; @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { ]; installPhase = lib.optionalString watchOnly '' - install -m 0755 -D watch $out/bin/watch - install -m 0644 -D watch.1 $out/share/man/man1/watch.1 + install -m 0755 -D src/watch $out/bin/watch + install -m 0644 -D man/watch.1 $out/share/man/man1/watch.1 ''; # no obvious exec in documented arguments; haven't trawled source