nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 11:36:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix static cross compiling of proot

Browse source
This commit is contained in:
Tobias Happ 2021-12-09 18:45:48 +01:00 • committed by Alexander Sosedkin
parent 983fe12a88
commit 1ad8c7ac48
3 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkgs/cross-compiling/pkgs.nix → pkgs/cross-compiling/cross-pkgs.nix
View file

@ -22,14 +22,4 @@ let
}; };
in in
{ loadNixpkgs { inherit crossSystem; }
cross = loadNixpkgs { inherit crossSystem; };
crossStatic = loadNixpkgs {
inherit crossSystem;
crossOverlays = [
(import "${path}/pkgs/top-level/static.nix")
];
};
}

6
pkgs/cross-compiling/proot-termux.nix
View file

@ -3,10 +3,12 @@
{ callPackage, fetchFromGitHub, tallocStatic }: { callPackage, fetchFromGitHub, tallocStatic }:
let let
pkgs = callPackage ./pkgs.nix { }; pkgsCross = callPackage ./cross-pkgs.nix { };
stdenv = pkgsCross.pkgsStatic.stdenvAdapters.makeStaticBinaries pkgsCross.stdenv;
in in
pkgs.crossStatic.stdenv.mkDerivation { stdenv.mkDerivation {
pname = "proot-termux"; pname = "proot-termux";
version = "unstable-2021-11-21"; version = "unstable-2021-11-21";

6
pkgs/cross-compiling/talloc-static.nix
View file

@ -3,10 +3,10 @@
{ callPackage, python3, wafHook }: { callPackage, python3, wafHook }:
let let
pkgs = callPackage ./pkgs.nix { }; pkgsCross = callPackage ./cross-pkgs.nix { };
in in
pkgs.cross.talloc.overrideAttrs (_: rec { pkgsCross.talloc.overrideAttrs (_: rec {
pname = "talloc-static"; pname = "talloc-static";
version = "2.3.2"; version = "2.3.2";
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -23,7 +23,7 @@ pkgs.cross.talloc.overrideAttrs (_: rec {
]; ];
postInstall = '' 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* rm -f $out/lib/libtalloc.so*
''; '';