tv: pass-otp -> pass.withExtensions

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

tv/5pkgs/simple/fzmenu/default.nix

@@ -1,37 +1,38 @@
-{ lib, stdenv
+{ lib, pkgs, stdenv }:
-, runCommand
-, coreutils, dash, gnused, fzf, pass-otp, rxvt_unicode, utillinux, xdotool
-}:
 
-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
+        pkgs.coreutils
-        dash
+        pkgs.dash
-        fzf
+        pkgs.fzf
-        gnused
+        pkgs.gnused
-        pass-otp
+        (pkgs.pass.withExtensions (ext: [
-        rxvt_unicode
+          ext.pass-otp
-        utillinux
+        ]))
-        xdotool
+        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
+        pkgs.coreutils
-        dash
+        pkgs.dash
-        fzf
+        pkgs.fzf
-        gnused
+        pkgs.gnused
-        pass-otp
+        (pkgs.pass.withExtensions (ext: [
-        rxvt_unicode
+          ext.pass-otp
-        utillinux
+        ]))
-        xdotool
+        pkgs.rxvt_unicode
+        pkgs.utillinux
+        pkgs.xdotool
       ]}
 ''