diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-24 10:57:50 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-24 11:06:53 +0200 |
| commit | 8137a8cb73833432e8da8281663b56ac01d3ba0b (patch) | |
| tree | 668c15897c9d23a41ef5ec908caa33ac3558caf6 /pkgs/stdenv/linux | |
| parent | 2fc7651b2584fe7b248fe0d93a6e9f58ba8a42d2 (diff) | |
| download | nixlib-8137a8cb73833432e8da8281663b56ac01d3ba0b.tar nixlib-8137a8cb73833432e8da8281663b56ac01d3ba0b.tar.gz nixlib-8137a8cb73833432e8da8281663b56ac01d3ba0b.tar.bz2 nixlib-8137a8cb73833432e8da8281663b56ac01d3ba0b.tar.lz nixlib-8137a8cb73833432e8da8281663b56ac01d3ba0b.tar.xz nixlib-8137a8cb73833432e8da8281663b56ac01d3ba0b.tar.zst nixlib-8137a8cb73833432e8da8281663b56ac01d3ba0b.zip | |
gawk: refactor
- Don't build with libsigsegv by default. The build apparently attempted to link against it, but it never retained the reference anyway... - Side effect: stdenv bootstrapping needs no libsigsegv anymore. - Run checks, but only in the interactive gawk by default on Linux, so that stdenv bootstrap isn't slowed down (by glibc locales, etc.). - xz should be no longer needed in inputs, as we have it in stdenvs now. The whole change was triggered by some used kernel versions still breaking libsigsegv tests #28464.
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 5c03d83d5f7b..48deb9a5c02c 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -303,7 +303,10 @@ in gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl ] # Library dependencies - ++ map getLib [ attr acl zlib pcre libsigsegv ] + ++ map getLib ( + [ attr acl zlib pcre ] + ++ lib.optional (gawk.libsigsegv != null) gawk.libsigsegv + ) # More complicated cases ++ [ glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders |