diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-04-24 20:39:23 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-04-24 20:39:23 +0200 |
commit | b7ca5d7406b0f5f511807a375b5a17fda4294864 (patch) | |
tree | d0e7449f3b9ad8d7ae85faffd4a41bb8992e1cae | |
parent | e167eac07781070022209e0561e6c7188d71f03f (diff) | |
parent | 15ebfa7be78d3390364b550ccbf1c55a09f4cfa4 (diff) |
Merge #227677: vim: Fix install phase parallelism
...and harden against future failures Merge into staging-next.
-rw-r--r-- | pkgs/applications/editors/vim/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 49af99fad144e..c5b9a607f20df 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation { pname = "vim"; - inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; + inherit (common) version src postPatch hardeningDisable enableParallelBuilding enableParallelInstalling meta; nativeBuildInputs = [ gettext pkg-config ]; buildInputs = [ ncurses bash gawk ] @@ -50,6 +50,15 @@ stdenv.mkDerivation { ln -s $out/bin/vim $out/bin/vi mkdir -p $out/share/vim cp "${vimrc}" $out/share/vim/vimrc + + # Prevent bugs in the upstream makefile from silently failing and missing outputs. + # Some of those are build-time requirements for other packages. + for tool in ex xxd vi view vimdiff; do + if [ ! -e "$out/bin/$tool" ]; then + echo "ERROR: install phase did not install '$tool'." + exit 1 + fi + done ''; __impureHostDeps = [ "/dev/ptmx" ]; |