diff options
| author | Benjamin Hipple <bhipple@protonmail.com> | 2020-07-05 20:36:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-05 20:36:07 -0400 |
| commit | 41307593381d295283ed51333743ba7cee9c07e4 (patch) | |
| tree | 837b2ce935b0e3476f936422261fd9fa5d3584c4 | |
| parent | 83f667613c5d84b521469e4a1f85f6b87771a12d (diff) | |
| parent | e45ddb758886875917a101a034e5b96b18e377e1 (diff) | |
| download | nixpkgs-41307593381d295283ed51333743ba7cee9c07e4.tar nixpkgs-41307593381d295283ed51333743ba7cee9c07e4.tar.gz nixpkgs-41307593381d295283ed51333743ba7cee9c07e4.tar.bz2 nixpkgs-41307593381d295283ed51333743ba7cee9c07e4.tar.lz nixpkgs-41307593381d295283ed51333743ba7cee9c07e4.tar.xz nixpkgs-41307593381d295283ed51333743ba7cee9c07e4.tar.zst nixpkgs-41307593381d295283ed51333743ba7cee9c07e4.zip | |
Merge pull request #92357 from bdesham/vim-configurable-patchelf-fix
vim_configurable: Only run patchelf on gvim if gvim was built
| -rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 83c8533f5cd..77d7ca983cd 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,5 +1,3 @@ -# TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. -# but I have gvim with python support now :) - Marc { source ? "default", callPackage, stdenv, ncurses, pkgconfig, gettext , writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu @@ -156,7 +154,12 @@ in stdenv.mkDerivation rec { '' + stdenv.lib.optionalString stdenv.isLinux '' patchelf --set-rpath \ "$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \ - "$out"/bin/{vim,gvim} + "$out"/bin/vim + if [[ -e "$out"/bin/gvim ]]; then + patchelf --set-rpath \ + "$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \ + "$out"/bin/gvim + fi ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc '' + stdenv.lib.optionalString wrapPythonDrv '' |