Merge staging-next into staging

2021-02-20 00:36:40 +00:00
parent f558ed1ea5 848226f810
commit abe7db36a4
93 changed files with 2835 additions and 1177 deletions
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
  postPatch = ''
    for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do
      substituteInPlace $f \
-        --replace "= gcc" "=cc" \
-        --replace "= g++" "=c++" \
+        --replace "= gcc" "=${stdenv.cc.targetPrefix}cc" \
+        --replace "= g++" "=${stdenv.cc.targetPrefix}c++" \
        --replace "-DGNU_RUNTIME=1" "" \
        --replace "-fgnu-runtime" "-fobjc-nonfragile-abi"
    done