Merge branch 'master' into staging

2017-11-28 21:06:44 +01:00
parent db6adec156 e0368f5076
commit 8b53b2ec2c
9 changed files with 38 additions and 18 deletions
--- a/pkgs/tools/networking/snabb/default.nix
+++ b/pkgs/tools/networking/snabb/default.nix
@@ -31,7 +31,9 @@ stdenv.mkDerivation rec {
    cp src/snabb $out/bin
  '';

-  enableParallelBuilding = true;
+  # Dependencies are underspecified: "make -C src obj/arch/sse2_c.o" fails with
+  # "Fatal error: can't create obj/arch/sse2_c.o: No such file or directory".
+  enableParallelBuilding = false;

  meta = with stdenv.lib; {
    homepage = https://github.com/SnabbCo/snabbswitch;
@@ -49,4 +51,3 @@ stdenv.mkDerivation rec {
    maintainers = [ maintainers.lukego maintainers.domenkozar ];
  };
 }
-