qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

procps: fix watchOnly = true; build

Browse Source 
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.
This commit is contained in:
Sergei Trofimovich 2024-10-17 10:32:42 +01:00
parent e5f3f61136
commit 4cac65085c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/procps-ng/default.nix
View File

@ -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