uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,11 @@
|
|||
--- a/url.c 2014-07-14 12:31:30.476563116 +0200
|
||||
+++ b/url.c 2014-07-14 12:32:16.364918248 +0200
|
||||
@@ -268,7 +268,7 @@ init_PRNG()
|
||||
if (RAND_status())
|
||||
return;
|
||||
if ((file = RAND_file_name(buffer, sizeof(buffer)))) {
|
||||
-#ifdef USE_EGD
|
||||
+#if defined(USE_EGD) && defined(HAVE_SSL_RAND_EGD)
|
||||
if (RAND_egd(file) > 0)
|
||||
return;
|
||||
#endif
|
||||
100
pkgs/applications/networking/browsers/w3m/default.nix
Normal file
100
pkgs/applications/networking/browsers/w3m/default.nix
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, ncurses, boehmgc, gettext, zlib
|
||||
, sslSupport ? true, openssl ? null
|
||||
, graphicsSupport ? !stdenv.isDarwin, imlib2 ? null
|
||||
, x11Support ? graphicsSupport, libX11 ? null
|
||||
, mouseSupport ? !stdenv.isDarwin, gpm-ncurses ? null
|
||||
, perl, man, pkg-config, buildPackages, w3m
|
||||
}:
|
||||
|
||||
assert sslSupport -> openssl != null;
|
||||
assert graphicsSupport -> imlib2 != null;
|
||||
assert x11Support -> graphicsSupport && libX11 != null;
|
||||
assert mouseSupport -> gpm-ncurses != null;
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
mktable = buildPackages.stdenv.mkDerivation {
|
||||
name = "w3m-mktable";
|
||||
inherit (w3m) src;
|
||||
nativeBuildInputs = [ pkg-config boehmgc ];
|
||||
makeFlags = [ "mktable" ];
|
||||
installPhase = ''
|
||||
install -D mktable $out/bin/mktable
|
||||
'';
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "w3m";
|
||||
version = "0.5.3+git20190105";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tats";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1fbg2p8qh2gvi3g4iz4q6vc0k70pf248r4yndi5lcn2m3mzvjx0i";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl";
|
||||
|
||||
# we must set these so that the generated files (e.g. w3mhelp.cgi) contain
|
||||
# the correct paths.
|
||||
PERL = "${perl}/bin/perl";
|
||||
MAN = "${man}/bin/man";
|
||||
|
||||
makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ];
|
||||
|
||||
patches = [
|
||||
./RAND_egd.libressl.patch
|
||||
(fetchpatch {
|
||||
name = "https.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/https.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03";
|
||||
sha256 = "08skvaha1hjyapsh8zw5dgfy433mw2hk7qy9yy9avn8rjqj7kjxk";
|
||||
})
|
||||
] ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ];
|
||||
|
||||
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 = [ pkg-config gettext ];
|
||||
buildInputs = [ ncurses boehmgc zlib ]
|
||||
++ optional sslSupport openssl
|
||||
++ optional mouseSupport gpm-ncurses
|
||||
++ optional graphicsSupport imlib2
|
||||
++ optional x11Support libX11;
|
||||
|
||||
postInstall = optionalString graphicsSupport ''
|
||||
ln -s $out/libexec/w3m/w3mimgdisplay $out/bin
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
configureFlags =
|
||||
[ "--with-ssl=${openssl.dev}" "--with-gc=${boehmgc.dev}" ]
|
||||
++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"ac_cv_func_setpgrp_void=yes"
|
||||
]
|
||||
++ optional graphicsSupport "--enable-image=${optionalString x11Support "x11,"}fb";
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path
|
||||
substituteInPlace ./configure --replace /usr /no-such-path
|
||||
'';
|
||||
|
||||
enableParallelBuilding = false;
|
||||
|
||||
# for w3mimgdisplay
|
||||
# see: https://bbs.archlinux.org/viewtopic.php?id=196093
|
||||
LIBS = optionalString x11Support "-lX11";
|
||||
|
||||
meta = {
|
||||
homepage = "http://w3m.sourceforge.net/";
|
||||
description = "A text-mode web browser";
|
||||
maintainers = [ maintainers.cstrahan ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
14
pkgs/applications/networking/browsers/w3m/no-x11.patch
Normal file
14
pkgs/applications/networking/browsers/w3m/no-x11.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
Forget about X11 in fb module.
|
||||
This breaks w3mimgdisplay under X11, but removes X11 dependency it in pure fb.
|
||||
diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c
|
||||
index 1a5151c..d3d7bc3 100644
|
||||
--- a/w3mimg/fb/fb_imlib2.c
|
||||
+++ b/w3mimg/fb/fb_imlib2.c
|
||||
@@ -3,6 +3,7 @@
|
||||
fb_imlib2.c 0.3 Copyright (C) 2002, hito
|
||||
**************************************************************************/
|
||||
|
||||
+#define X_DISPLAY_MISSING
|
||||
#include <Imlib2.h>
|
||||
#include "fb.h"
|
||||
#include "fb_img.h"
|
||||
Loading…
Add table
Add a link
Reference in a new issue