summary refs log tree commit diff
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2018-08-06 20:41:01 +0200
committerGitHub <noreply@github.com>2018-08-06 20:41:01 +0200
commitb234f07762295e9766708711c6921290e461fafe (patch)
treefd0d5ce0f269567ec7ecabe7f367d1efb03cd7b4
parent9934f0bb51afbee232f58fcdaac060c1dc48f0dd (diff)
parent9bf0ebac7e76cb03904d34dfd9512bb76d35f7b4 (diff)
downloadnixlib-b234f07762295e9766708711c6921290e461fafe.tar
nixlib-b234f07762295e9766708711c6921290e461fafe.tar.gz
nixlib-b234f07762295e9766708711c6921290e461fafe.tar.bz2
nixlib-b234f07762295e9766708711c6921290e461fafe.tar.lz
nixlib-b234f07762295e9766708711c6921290e461fafe.tar.xz
nixlib-b234f07762295e9766708711c6921290e461fafe.tar.zst
nixlib-b234f07762295e9766708711c6921290e461fafe.zip
Merge pull request #44559 from kalbasit/nixpkgs_fix-tmux-fzf-url
tmux-plugins: fix the fzf-tmux-url derivation
-rw-r--r--pkgs/misc/tmux-plugins/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 6d8a5a40c162..fc587d950c1c 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";