diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
| commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
| tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix | |
| parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
| parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
| download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip | |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix')
| -rw-r--r-- | nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix b/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix index b6c75e03654d..3d36edb32325 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix @@ -6,7 +6,7 @@ rec { addRtp = path: attrs: derivation: - derivation // { rtp = "${derivation}/${path}"; } // { + derivation // { rtp = "${derivation}"; } // { overrideAttrs = f: buildVimPlugin (attrs // f attrs); }; @@ -26,7 +26,11 @@ rec { addRtp "${rtpPath}/${path}" attrs (stdenv.mkDerivation (attrs // { name = namePrefix + name; - nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ vimGenDocHook ]; + # dont move the doc folder since vim expects it + forceShare= [ "man" "info" ]; + + nativeBuildInputs = attrs.nativeBuildInputs or [] + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) vimGenDocHook; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; installPhase = '' |