Merge commit 'ba68231273bea4cba01413fd2a0e56d68db9234c' into HEAD

2017-07-31 09:12:15 +02:00
parent 2a48a62b9c ba68231273
commit 740d76371e
132 changed files with 1447 additions and 1285 deletions
@@ -59,6 +59,10 @@ stdenv.mkDerivation rec {

  hardeningDisable = [ "stackprotector" ];

+  preConfigure = ''
+    unset CPP # intereferes with dependency calculation
+  '';
+
  configureFlags =
    [ "--smbd=smbd" # use `smbd' from $PATH
      "--audio-drv-list=${audio}"