Merge branch 'master' into staging-next

2019-01-10 13:07:21 +01:00
parent 528664e3bb e0fd84cf43
commit 287144e342
254 changed files with 5494 additions and 3475 deletions
@@ -9,6 +9,10 @@ stdenv.mkDerivation {

  buildInputs = [ libmtsupport libfacet libbtree multitrandata ];

+  NIX_LDFLAGS = [
+    "-lbtree"
+  ];
+
  patchPhase = ''
    sed -i -e 's@\$(DESTDIR)/usr@'$out'@' \
      -e 's@/usr/include/mt/support@${libmtsupport}/include/mt/support@' \
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {

  configurePhase = ''
    mkdir -p $out/{bin,man/man1}
-    makeFlags="PREFIX=$out"
+    makeFlags="PREFIX=$out CC=$CXX"
  '';

  meta = {