diff --git a/pkgs/cross-compiling/pkgs.nix b/pkgs/cross-compiling/cross-pkgs.nix similarity index 74% rename from pkgs/cross-compiling/pkgs.nix rename to pkgs/cross-compiling/cross-pkgs.nix index 013bc71..2ae9b1e 100644 --- a/pkgs/cross-compiling/pkgs.nix +++ b/pkgs/cross-compiling/cross-pkgs.nix @@ -22,14 +22,4 @@ let }; in -{ - cross = loadNixpkgs { inherit crossSystem; }; - - crossStatic = loadNixpkgs { - inherit crossSystem; - - crossOverlays = [ - (import "${path}/pkgs/top-level/static.nix") - ]; - }; -} +loadNixpkgs { inherit crossSystem; } diff --git a/pkgs/cross-compiling/proot-termux.nix b/pkgs/cross-compiling/proot-termux.nix index 0ecc254..4a70bbf 100644 --- a/pkgs/cross-compiling/proot-termux.nix +++ b/pkgs/cross-compiling/proot-termux.nix @@ -3,10 +3,12 @@ { callPackage, fetchFromGitHub, tallocStatic }: let - pkgs = callPackage ./pkgs.nix { }; + pkgsCross = callPackage ./cross-pkgs.nix { }; + + stdenv = pkgsCross.pkgsStatic.stdenvAdapters.makeStaticBinaries pkgsCross.stdenv; in -pkgs.crossStatic.stdenv.mkDerivation { +stdenv.mkDerivation { pname = "proot-termux"; version = "unstable-2021-11-21"; diff --git a/pkgs/cross-compiling/talloc-static.nix b/pkgs/cross-compiling/talloc-static.nix index ea93fa8..733d5f5 100644 --- a/pkgs/cross-compiling/talloc-static.nix +++ b/pkgs/cross-compiling/talloc-static.nix @@ -3,10 +3,10 @@ { callPackage, python3, wafHook }: let - pkgs = callPackage ./pkgs.nix { }; + pkgsCross = callPackage ./cross-pkgs.nix { }; in -pkgs.cross.talloc.overrideAttrs (_: rec { +pkgsCross.talloc.overrideAttrs (_: rec { pname = "talloc-static"; version = "2.3.2"; name = "${pname}-${version}"; @@ -23,7 +23,7 @@ pkgs.cross.talloc.overrideAttrs (_: rec { ]; postInstall = '' - ${pkgs.cross.stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc.c.[0-9]*.o + ${pkgsCross.stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc.c.[0-9]*.o rm -f $out/lib/libtalloc.so* '';