Merge master into staging-next

2018-07-16 17:11:01 +02:00
parent 3c09808160 862e4e4fdb
commit f001c81c1a
22 changed files with 2672 additions and 1265 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, enableStatic ? false }:

 stdenv.mkDerivation rec {
  name = "xz-5.2.4";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {

  outputs = [ "bin" "dev" "out" "man" "doc" ];

+  configureFlags = stdenv.lib.optional enableStatic "--disable-shared";
+
  doCheck = true;

  preCheck = ''