summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/xu/config.nix4
-rw-r--r--tv/5pkgs/simple/fzmenu/default.nix47
2 files changed, 27 insertions, 24 deletions
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index 05c5c11b0..8a86e209b 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -45,7 +45,9 @@ with import <stockholm/lib>;
netcup
nmap
p7zip
- pass-otp
+ (pkgs.pass.withExtensions (ext: [
+ ext.pass-otp
+ ]))
q
qrencode
texlive.combined.scheme-full
diff --git a/tv/5pkgs/simple/fzmenu/default.nix b/tv/5pkgs/simple/fzmenu/default.nix
index 1f1b82848..634d8338b 100644
--- a/tv/5pkgs/simple/fzmenu/default.nix
+++ b/tv/5pkgs/simple/fzmenu/default.nix
@@ -1,37 +1,38 @@
-{ lib, stdenv
-, runCommand
-, coreutils, dash, gnused, fzf, pass-otp, rxvt_unicode, utillinux, xdotool
-}:
+{ lib, pkgs, stdenv }:
-runCommand "fzmenu" {
+pkgs.runCommand "fzmenu" {
} /* sh */ ''
mkdir $out
cp -r ${./bin} $out/bin
substituteInPlace $out/bin/otpmenu \
- --replace '#! /bin/sh' '#! ${dash}/bin/dash' \
+ --replace '#! /bin/sh' '#! ${pkgs.dash}/bin/dash' \
--replace '#PATH=' PATH=${lib.makeBinPath [
- coreutils
- dash
- fzf
- gnused
- pass-otp
- rxvt_unicode
- utillinux
- xdotool
+ pkgs.coreutils
+ pkgs.dash
+ pkgs.fzf
+ pkgs.gnused
+ (pkgs.pass.withExtensions (ext: [
+ ext.pass-otp
+ ]))
+ pkgs.rxvt_unicode
+ pkgs.utillinux
+ pkgs.xdotool
]}
substituteInPlace $out/bin/passmenu \
- --replace '#! /bin/sh' '#! ${dash}/bin/dash' \
+ --replace '#! /bin/sh' '#! ${pkgs.dash}/bin/dash' \
--replace '#PATH=' PATH=${lib.makeBinPath [
- coreutils
- dash
- fzf
- gnused
- pass-otp
- rxvt_unicode
- utillinux
- xdotool
+ pkgs.coreutils
+ pkgs.dash
+ pkgs.fzf
+ pkgs.gnused
+ (pkgs.pass.withExtensions (ext: [
+ ext.pass-otp
+ ]))
+ pkgs.rxvt_unicode
+ pkgs.utillinux
+ pkgs.xdotool
]}
''