From 9bf0ebac7e76cb03904d34dfd9512bb76d35f7b4 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Mon, 6 Aug 2018 10:13:01 -0700 Subject: [PATCH] tmux-plugins: fix the fzf-tmux-url derivation --- pkgs/misc/tmux-plugins/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 6d8a5a40c16..fc587d950c1 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -3,13 +3,14 @@ let rtpPath = "share/tmux-plugins"; - addRtp = path: pluginName: attrs: derivation: - derivation // { rtp = "${derivation}/${path}/${builtins.replaceStrings ["-"] ["_"] pluginName}.tmux"; } // { + addRtp = path: rtpFilePath: attrs: derivation: + derivation // { rtp = "${derivation}/${path}/${rtpFilePath}"; } // { overrideAttrs = f: buildTmuxPlugin (attrs // f attrs); }; buildTmuxPlugin = a@{ pluginName, + rtpFilePath ? (builtins.replaceStrings ["-"] ["_"] pluginName) + ".tmux", namePrefix ? "tmuxplugin-", src, unpackPhase ? "", @@ -22,7 +23,7 @@ let dependencies ? [], ... }: - addRtp "${rtpPath}/${path}" pluginName a (stdenv.mkDerivation (a // { + addRtp "${rtpPath}/${path}" rtpFilePath a (stdenv.mkDerivation (a // { name = namePrefix + pluginName; inherit pluginName unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; @@ -102,6 +103,7 @@ in rec { fzf-tmux-url = buildTmuxPluginFrom2Nix { pluginName = "fzf-tmux-url"; + rtpFilePath = "fzf-url.tmux"; src = fetchgit { url = "https://github.com/wfxr/tmux-fzf-url"; rev = "ecd518eec1067234598c01e655b048ff9d06ef2f";