Merge pull request #58504 from symphorien/static-proot

Static proot, wafHook cross compilation
2019-04-13 12:04:32 -04:00
parent 14a008dba6 a79a8f29bc
commit 59c81160e7
15 changed files with 44 additions and 42 deletions
@@ -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;