From f113b93aa8416b74cf6d2796913147893cc78e49 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 25 Jun 2017 16:15:18 +0200
Subject: [PATCH] tv: properly use symlinkJoin paths
Because earlier entries override later ones.
---
tv/2configs/htop.nix | 2 +-
tv/2configs/vim.nix | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tv/2configs/htop.nix b/tv/2configs/htop.nix
index 5d7e0272b..d7d2d7bfd 100644
--- a/tv/2configs/htop.nix
+++ b/tv/2configs/htop.nix
@@ -7,7 +7,6 @@ with import <stockholm/lib>;
htop = pkgs.symlinkJoin {
name = "htop";
paths = [
- super.htop
(pkgs.writeDashBin "htop" ''
export HTOPRC=${pkgs.writeText "htoprc" ''
fields=0 48 17 18 38 39 40 2 46 47 49 1
@@ -37,6 +36,7 @@ with import <stockholm/lib>;
''}
exec ${super.htop}/bin/htop "$@"
'')
+ super.htop
];
};
};
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 93ed46dc8..a3af93772 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -300,7 +300,6 @@ let {
vim-wrapper = pkgs.symlinkJoin {
name = "vim";
paths = [
- pkgs.vim_configurable
(pkgs.writeDashBin "vim" ''
set -efu
(umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
@@ -310,6 +309,7 @@ let {
# vim-orgmode needs Python, thus vim_configurable instead of just vim
exec ${pkgs.vim_configurable}/bin/vim "$@"
'')
+ pkgs.vim_configurable
];
};