pyrox.dev
Merge #227677: vim: Fix install phase parallelism
...and harden against future failures
Merge into staging-next.
+10
-1
pkgs/applications/editors/vim/default.nix
+10
-1
pkgs/applications/editors/vim/default.nix
···
15
15
stdenv.mkDerivation {
16
16
pname = "vim";
17
17
18
-
inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
18
+
inherit (common) version src postPatch hardeningDisable enableParallelBuilding enableParallelInstalling meta;
19
19
20
20
nativeBuildInputs = [ gettext pkg-config ];
21
21
buildInputs = [ ncurses bash gawk ]
···
50
50
ln -s $out/bin/vim $out/bin/vi
51
51
mkdir -p $out/share/vim
52
52
cp "${vimrc}" $out/share/vim/vimrc
53
+
54
+
# Prevent bugs in the upstream makefile from silently failing and missing outputs.
55
+
# Some of those are build-time requirements for other packages.
56
+
for tool in ex xxd vi view vimdiff; do
57
+
if [ ! -e "$out/bin/$tool" ]; then
58
+
echo "ERROR: install phase did not install '$tool'."
59
+
exit 1
60
+
fi
61
+
done
53
62
'';
54
63
55
64
__impureHostDeps = [ "/dev/ptmx" ];