From 72b627100c48ba33e9b5d2040effa8e1e6d8de22 Mon Sep 17 00:00:00 2001 From: colin Date: Mon, 19 Dec 2022 06:18:44 +0000 Subject: [PATCH] sane-scripts: simplify recursively referencing sane scripts --- pkgs/sane-scripts/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/sane-scripts/default.nix b/pkgs/sane-scripts/default.nix index 2321116b..de70a519 100644 --- a/pkgs/sane-scripts/default.nix +++ b/pkgs/sane-scripts/default.nix @@ -18,6 +18,10 @@ resholve.mkDerivation { scripts = [ "bin/*" ]; interpreter = "${pkgs.bash}/bin/bash"; inputs = with pkgs; [ + # string is interpreted as relative path from @OUT@. + # this lets our scripts reference eachother. + # see: + "bin" coreutils curl duplicity @@ -55,11 +59,6 @@ resholve.mkDerivation { # https://github.com/abathur/resholve/issues/29 "umount" "sudo" - - # these are used internally; probably a better fix - "sane-mount-servo" - "sane-private-lock" - "sane-private-unlock" ]; };