diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-04-13 12:04:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-13 12:04:32 -0400 |
| commit | 59c81160e7df5d5d1b143b1d2e46385debc6bfea (patch) | |
| tree | 6357d03a315666055aebcda1da18751dbaae229a /pkgs/tools/system | |
| parent | 14a008dba64ab32c677eee005d1cda3fe460b763 (diff) | |
| parent | a79a8f29bc509b2d51158846c9562e64e1239b4c (diff) | |
| download | nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.gz nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.bz2 nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.lz nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.xz nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.zst nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.zip | |
Merge pull request #58504 from symphorien/static-proot
Static proot, wafHook cross compilation
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/proot/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 2381ce6c0db1..c8028ed74a7c 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/GNUmakefile \ --replace /bin/echo ${coreutils}/bin/echo + # our cross machinery defines $CC and co just right + sed -i /CROSS_COMPILE/d src/GNUmakefile ''; buildInputs = [ talloc ] ++ stdenv.lib.optional enablePython python; |