Merge branch 'master' into staging

2016-08-20 18:01:36 +02:00
parent f616c0f1f0 a451e06dc5
commit cdb44a4ada
16 changed files with 232 additions and 40 deletions
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
    owner = "cedric-vincent";
  };

-  buildInputs = [ talloc ];
+  buildInputs = [ talloc ] ++ stdenv.lib.optional enableStatic stdenv.cc.libc.static;
  nativeBuildInputs = [ docutils ];

  enableParallelBuilding = true;

  preBuild = stdenv.lib.optionalString enableStatic ''
-    export LDFLAGS="-static -L${talloc}/lib"
+    export LDFLAGS="-static"
  '';

  makeFlags = [ "-C src" ];