Forward 'pkgs' to sub packages.

ngi-nix · Sep 7, 2021 · e96adce · e96adce
1 parent 83a0c37
commit e96adce
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/flake.nix b/flake.nix
@@ -146,23 +146,20 @@
           pwdsphinx = callPackage ./pkgs/pwdsphinx {
             version = pwdsphinx-version;
             src = pwdsphinx-src;
-            zxcvbn = zxcvbn;
-            qrcodegen = qrcodegen;
+            inherit libsphinx pysodium securestring qrcodegen zxcvbn;
           };
 
           androsphinxCryptoLibs = callPackage ./pkgs/androsphinx/libs.nix {
             version = androsphinx-version;
             src = androsphinx-src;
-            androidSystem = androidSystemByNixSystem.${system};
-            inherit libsphinx-src;
+            inherit libsphinx-src libsodium-src ndk androidSystem;
           };
           androsphinx = callPackage ./pkgs/androsphinx {
             version = androsphinx-version;
             src = androsphinx-src;
           };
 
           zphinxzerver = callPackage ./pkgs/zphinxzerver {
-            pkgs = final.pkgs;
             version = zphinxzerver-version;
             src = zphinxzerver-src;
             inherit bearssl-src libsphinx-src zigtoml-src;

diff --git a/pkgs/androsphinx/default.nix b/pkgs/androsphinx/default.nix
@@ -1,4 +1,5 @@
-{ version, src, androsphinxCryptoLibs, sdk, callPackage }:
+{ pkgs, version, src, androsphinxCryptoLibs, sdk }:
+with pkgs;
 let buildGradle = callPackage ./gradle-env.nix { };
 in buildGradle {
   inherit version src;

diff --git a/pkgs/androsphinx/libs.nix b/pkgs/androsphinx/libs.nix
@@ -1,5 +1,5 @@
-{ version, src, libsodium-src, libsphinx-src, stdenvNoCC, pkgconf, ndk
-, androidSystem }:
+{ pkgs, version, src, libsodium-src, libsphinx-src, ndk, androidSystem }:
+with pkgs;
 # Use stdenvNoCC to not make GCC interfere with the Android compilers.
 stdenvNoCC.mkDerivation {
   name = "androsphinxCryptoLibs-${version}";

diff --git a/pkgs/libsphinx/default.nix b/pkgs/libsphinx/default.nix
@@ -1,4 +1,5 @@
-{ version, src, stdenv, pkgconf, libsodium }:
+{ pkgs, version, src }:
+with pkgs;
 let standaloneBinaries = "2pass challenge respond derive";
 in stdenv.mkDerivation {
   inherit src version;

diff --git a/pkgs/pwdsphinx/default.nix b/pkgs/pwdsphinx/default.nix
@@ -1,6 +1,6 @@
-{ version, src, buildPythonPackage, libsphinx, pysodium, securestring, qrcodegen
-, zxcvbn, stdenv, crudini }:
-
+{ pkgs, version, src, libsphinx, pysodium, securestring, qrcodegen, zxcvbn }:
+with pkgs;
+# todo: rename oracle (ando ther binaries?)
 buildPythonPackage rec {
   pname = "pwdsphinx";
   inherit src version;

diff --git a/pkgs/pysodium/default.nix b/pkgs/pysodium/default.nix
@@ -1,4 +1,5 @@
-{ version, src, stdenv, buildPythonPackage, libsodium }:
+{ pkgs, version, src }:
+with pkgs;
 buildPythonPackage rec {
   pname = "pysodium";
   inherit version src;

diff --git a/pkgs/qrcodegen/default.nix b/pkgs/qrcodegen/default.nix
@@ -1,5 +1,5 @@
-{ version, src, buildPythonPackage }:
-
+{ pkgs, version, src }:
+with pkgs;
 buildPythonPackage {
   name = "qrcodegen";
   inherit version src;

diff --git a/pkgs/securestring/default.nix b/pkgs/securestring/default.nix
@@ -1,5 +1,5 @@
-{ version, src, buildPythonPackage, openssl }:
-
+{ pkgs, version, src }:
+with pkgs;
 buildPythonPackage rec {
   pname = "securestring";
   inherit src version;