diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-16 17:11:01 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-16 17:11:01 +0200 |
| commit | f001c81c1accfd3c3e9ca96f51a20be92875bc0d (patch) | |
| tree | 6e9c5c362cf3ff2ffcc25694c51272d3c35fbf9f /pkgs/tools | |
| parent | 3c09808160bd06eeee14bdca462fa9b3ef947271 (diff) | |
| parent | 862e4e4fdb665981b140fda9dcf7298f09fbc061 (diff) | |
| download | nixlib-f001c81c1accfd3c3e9ca96f51a20be92875bc0d.tar nixlib-f001c81c1accfd3c3e9ca96f51a20be92875bc0d.tar.gz nixlib-f001c81c1accfd3c3e9ca96f51a20be92875bc0d.tar.bz2 nixlib-f001c81c1accfd3c3e9ca96f51a20be92875bc0d.tar.lz nixlib-f001c81c1accfd3c3e9ca96f51a20be92875bc0d.tar.xz nixlib-f001c81c1accfd3c3e9ca96f51a20be92875bc0d.tar.zst nixlib-f001c81c1accfd3c3e9ca96f51a20be92875bc0d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/compression/xz/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 37c0c6d1c7e8..0ff349e96e80 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -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 = '' |