sane-scripts: tidy up python deps

pkgs/additional/sane-scripts/default.nix

@@ -14,6 +14,7 @@ let
       version = "0.1.0";
       format = "setuptools";
       src = ./src/lib/bt;
+      propagatedBuildInputs = [ transmission ];
       pythonImportChecks = [
         "sane_bt"
       ];
@@ -23,7 +24,6 @@ let
       version = "0.1.0";
       format = "setuptools";
       src = ./src/lib/ssdp;
-      propagatedBuildInputs = [ transmission ];
       pythonImportChecks = [
         "sane_ssdp"
       ];
@@ -47,11 +47,13 @@ let
       pname = "sane-bt-add";
       src = ./src;
       pyPkgs = [ "sane-lib.bt" ];
+      pkgs = [ "sane-scripts.lib.bt.propagatedBuildInputs" ];
     };
     bt-rm = static-nix-shell.mkPython3Bin {
       pname = "sane-bt-rm";
       src = ./src;
       pyPkgs = [ "sane-lib.bt" ];
+      pkgs = [ "sane-scripts.lib.bt.propagatedBuildInputs" ];
     };
     bt-search = static-nix-shell.mkPython3Bin {
       pname = "sane-bt-search";
@@ -62,6 +64,7 @@ let
       pname = "sane-bt-show";
       src = ./src;
       pyPkgs = [ "sane-lib.bt" ];
+      pkgs = [ "sane-scripts.lib.bt.propagatedBuildInputs" ];
     };
     deadlines = static-nix-shell.mkBash {
       pname = "sane-deadlines";

pkgs/additional/sane-scripts/src/sane-bt-add

@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.sane-lib.bt ])"
+#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.sane-lib.bt ])" -p sane-scripts.lib.bt.propagatedBuildInputs
 # vim: set filetype=python :
 
 import argparse

pkgs/additional/sane-scripts/src/sane-bt-rm

@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.sane-lib.bt ])"
+#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.sane-lib.bt ])" -p sane-scripts.lib.bt.propagatedBuildInputs
 # vim: set filetype=python :
 
 import argparse

pkgs/additional/sane-scripts/src/sane-bt-show

@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.sane-lib.bt ])"
+#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.sane-lib.bt ])" -p sane-scripts.lib.bt.propagatedBuildInputs
 # vim: set filetype=python :
 
 import argparse

pkgs/additional/static-nix-shell/default.nix

@@ -42,6 +42,9 @@ in rec {
       (pname: " -p ${pname}")
       pkgExprs
     );
+    # allow any package to be a list of packages, to support things like
+    # -p python3Packages.foo.propagatedBuildInputs
+    pkgsEnv' = lib.flatten pkgsEnv;
   in
     stdenv.mkDerivation ({
       version = "0.1.0";  # default version
@@ -63,7 +66,7 @@ in rec {
 
         # add runtime dependencies to PATH
         wrapProgram $out/bin/${srcPath} \
-          --suffix PATH : ${lib.makeBinPath pkgsEnv }
+          --suffix PATH : ${lib.makeBinPath pkgsEnv' }
 
         runHook postInstall
       '';