From ebe1ebaba8c0baa1db9691a8c97acf0f7a1fbe89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 29 Nov 2010 18:03:03 +0000 Subject: [PATCH] Adding a stdenv version of links2, to be able to cross-build it. This can be removed once builderDefs can be made to support the stdenvCross adapter svn path=/nixpkgs/branches/stdenv-updates/; revision=24927 --- .../networking/browsers/links2/stdenv.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/networking/browsers/links2/stdenv.nix diff --git a/pkgs/applications/networking/browsers/links2/stdenv.nix b/pkgs/applications/networking/browsers/links2/stdenv.nix new file mode 100644 index 00000000000..923d0aff0f5 --- /dev/null +++ b/pkgs/applications/networking/browsers/links2/stdenv.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, libpng, libjpeg, bzip2, zlib, libtiff, gpm, openssl, pkgconfig, directfb +, enableX11 ? true, libX11, libXau, xproto, libXt }: + +let + version="2.2"; + name="links2-2.2"; + hash="188y37rw4s9brl55ncc12q1b45w0caxcnsq1gqyby9byw1sawnq9"; + url="http://links.twibright.com/download/links-${version}.tar.gz"; + advertisedUrl="http://links.twibright.com/download/links-2.2.tar.gz"; +in + +stdenv.mkDerivation { + inherit name; + + src = fetchurl { + inherit url; + sha256 = hash; + }; + + buildInputs = [ libpng libjpeg bzip2 zlib libtiff gpm openssl pkgconfig directfb ] + ++ stdenv.lib.optionals enableX11 [ libX11 libXau xproto libXt ]; + + configureFlags = [ + "--enable-graphics" + "--with-ssl" + "--with-fb" + ] ++ stdenv.lib.optional enableX11 "--with-x"; + + crossAttrs = { + preConfigure = '' + export CC=$crossConfig-gcc + ''; + }; + + meta = { + description = "A small browser with some graphics support"; + maintainers = [ + stdenv.lib.maintainers.viric + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e0c9e1353f..4cf3a33b70b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6045,6 +6045,8 @@ let inherit (xlibs) libX11 libXau xproto libXt; }; + links2Stdenv = callPackage ../applications/networking/browsers/links2/stdenv.nix { }; + lxdvdrip = callPackage ../applications/video/lxdvdrip { }; lynx = callPackage ../applications/networking/browsers/lynx { };