diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-23 20:24:27 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-23 20:24:27 -0400 |
| commit | 87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd (patch) | |
| tree | 8ccfb9bda2e3121ca35fbca93f2680c7c71a9d6e /pkgs/applications/networking | |
| parent | 56761c9b3d6f829a4f80e02d18fff30e8a6af1eb (diff) | |
| parent | f43ae985a68e515197c57de5ab8413d63ae6ef1a (diff) | |
| download | nixlib-87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd.tar nixlib-87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd.tar.gz nixlib-87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd.tar.bz2 nixlib-87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd.tar.lz nixlib-87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd.tar.xz nixlib-87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd.tar.zst nixlib-87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd.zip | |
Merge some merged cross-compilation PRs into into staging
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/lynx/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 42f454191989..bbf034a13424 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, ncurses, gzip, pkgconfig +{ stdenv, buildPackages +, fetchurl, pkgconfig, ncurses, gzip , sslSupport ? true, openssl ? null +, buildPlatform, hostPlatform }: assert sslSupport -> openssl != null; @@ -15,7 +17,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl"; - nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig; + nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig + ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc; + buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev; meta = with stdenv.lib; { |