diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2018-08-28 13:30:25 +0300 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2018-08-28 13:32:55 +0300 |
commit | 083220867c71443b0473374e8abe871cecb8b7d9 (patch) | |
tree | fe5f5a0f74eb25f907aa6cb8a850805efe546800 /pkgs/applications/editors/vim | |
parent | 9006cd339cdfb8b45aca54d6730928cfcdfb7909 (diff) | |
download | nixlib-083220867c71443b0473374e8abe871cecb8b7d9.tar nixlib-083220867c71443b0473374e8abe871cecb8b7d9.tar.gz nixlib-083220867c71443b0473374e8abe871cecb8b7d9.tar.bz2 nixlib-083220867c71443b0473374e8abe871cecb8b7d9.tar.lz nixlib-083220867c71443b0473374e8abe871cecb8b7d9.tar.xz nixlib-083220867c71443b0473374e8abe871cecb8b7d9.tar.zst nixlib-083220867c71443b0473374e8abe871cecb8b7d9.zip |
Improve re-wrapping in case of GTK3
Diffstat (limited to 'pkgs/applications/editors/vim')
-rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 3711b3cdcee4..2f2c787ffac5 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -155,9 +155,26 @@ in stdenv.mkDerivation rec { '' + stdenv.lib.optionalString wrapPythonDrv '' wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin" '' + stdenv.lib.optionalString (guiSupport == "gtk3") '' - rm "$out/bin/gvim" - echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" -g "$@"' > "$out/bin/gvim" - chmod a+x "$out/bin/gvim" + + rewrap () { + rm -f "$out/bin/$1" + echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1" + chmod a+x "$out/bin/$1" + } + + rewrap ex -e + rewrap view -R + rewrap gvim -g + rewrap gex -eg + rewrap gview -Rg + rewrap rvim -Z + rewrap rview -RZ + rewrap rgvim -gZ + rewrap rgview -RgZ + rewrap evim -y + rewrap eview -yR + rewrap vimdiff -d + rewrap gvimdiff -gd ''; preInstall = '' |