diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2018-12-11 00:23:09 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2018-12-11 18:13:21 +0100 |
commit | 999387d7181d4f462436ffb7bac2b88e20f2e8e9 (patch) | |
tree | f0b6bee7884d31472dfa998bac9b0b20c6832d76 /pkgs | |
parent | 629d011ceaefad633c0254d8e17e2640fda2e542 (diff) | |
download | nixlib-999387d7181d4f462436ffb7bac2b88e20f2e8e9.tar nixlib-999387d7181d4f462436ffb7bac2b88e20f2e8e9.tar.gz nixlib-999387d7181d4f462436ffb7bac2b88e20f2e8e9.tar.bz2 nixlib-999387d7181d4f462436ffb7bac2b88e20f2e8e9.tar.lz nixlib-999387d7181d4f462436ffb7bac2b88e20f2e8e9.tar.xz nixlib-999387d7181d4f462436ffb7bac2b88e20f2e8e9.tar.zst nixlib-999387d7181d4f462436ffb7bac2b88e20f2e8e9.zip |
w3m: fix cross-build
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/browsers/w3m/default.nix | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 70eb381c60e8..75998662f7f2 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -4,7 +4,7 @@ , graphicsSupport ? true, imlib2 ? null , x11Support ? graphicsSupport, libX11 ? null , mouseSupport ? !stdenv.isDarwin, gpm-ncurses ? null -, perl, man, pkgconfig +, perl, man, pkgconfig, buildPackages, w3m }: assert sslSupport -> openssl != null; @@ -14,7 +14,17 @@ assert mouseSupport -> gpm-ncurses != null; with stdenv.lib; -stdenv.mkDerivation rec { +let + mktable = buildPackages.stdenv.mkDerivation rec { + name = "w3m-mktable"; + inherit (w3m) src; + nativeBuildInputs = [ pkgconfig boehmgc ]; + makeFlags = [ "mktable" ]; + installPhase = '' + install -D mktable $out/bin/mktable + ''; + }; +in stdenv.mkDerivation rec { name = "w3m-0.5.3+git20180125"; src = fetchFromGitHub { @@ -31,6 +41,8 @@ stdenv.mkDerivation rec { PERL = "${perl}/bin/perl"; MAN = "${man}/bin/man"; + makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; + patches = [ ./RAND_egd.libressl.patch (fetchpatch { @@ -40,8 +52,14 @@ stdenv.mkDerivation rec { }) ] ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses boehmgc gettext zlib ] + postPatch = optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + ln -s ${mktable}/bin/mktable mktable + # stop make from recompiling mktable + sed -ie 's!mktable.*:.*!mktable:!' Makefile.in + ''; + + nativeBuildInputs = [ pkgconfig gettext ]; + buildInputs = [ ncurses boehmgc zlib ] ++ optional sslSupport openssl ++ optional mouseSupport gpm-ncurses ++ optional graphicsSupport imlib2 |