From 661f082d4743daafce7b8120ce734dff3e979169 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 5 Nov 2009 21:10:03 +0000 Subject: [PATCH] Update directfb svn path=/nixpkgs/trunk/; revision=18158 --- .../libraries/directfb/default.nix | 24 ++++++++++++++----- .../libraries/directfb/src-for-default.nix | 9 +++++++ .../directfb/src-info-for-default.nix | 6 +++++ 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/directfb/src-for-default.nix create mode 100644 pkgs/development/libraries/directfb/src-info-for-default.nix diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 3a887704a214..0a3c5e5d7b2a 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,17 +1,29 @@ {stdenv, fetchurl, perl, zlib, libjpeg, freetype, - SDL, libX11, xproto, xextproto, libXext, libpng}: - + SDL, libX11, xproto, xextproto, libXext, libpng, + renderproto, libXrender, giflib}: +let s = import ./src-for-default.nix; in stdenv.mkDerivation { - name = "directfb-1.1.0"; + inherit (s) name; src = fetchurl { - url = http://www.directfb.org/downloads/Core/DirectFB-1.1.0.tar.gz; - sha256 = "0fpjlgsyblvcjvqk8m3va2xsyx512mf26kwfsxarj1vql9b75s0f"; + url = s.url; + sha256 = s.hash; }; buildInputs = [perl zlib libjpeg freetype SDL - xproto libX11 libXext xextproto libpng]; + xproto libX11 libXext xextproto libpng + renderproto libXrender giflib + ]; + NIX_LDFLAGS="-lgcc_s"; configureFlags = [ "--enable-sdl" "--enable-zlib" "--with-gfxdrivers=all" + "--enable-devmem" + "--enable-fbdev" + "--enable-x11" + "--enable-mmx" + "--enable-sse" + "--enable-sysfs" + "--with-software" + "--with-smooth-scaling" ]; } diff --git a/pkgs/development/libraries/directfb/src-for-default.nix b/pkgs/development/libraries/directfb/src-for-default.nix new file mode 100644 index 000000000000..265be997b6fa --- /dev/null +++ b/pkgs/development/libraries/directfb/src-for-default.nix @@ -0,0 +1,9 @@ +rec { + version="1.4.2"; + name="directfb-1.4.2"; + hash="1invmmccscv44v2pa83050cv5n028q0j12cgwwpc7ac83vi4f605"; + url="http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${version}.tar.gz"; + advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.2.tar.gz"; + + +} diff --git a/pkgs/development/libraries/directfb/src-info-for-default.nix b/pkgs/development/libraries/directfb/src-info-for-default.nix new file mode 100644 index 000000000000..f8c0f0d1f9b1 --- /dev/null +++ b/pkgs/development/libraries/directfb/src-info-for-default.nix @@ -0,0 +1,6 @@ +{ + baseName = "directfb"; + downloadPage = "http://directfb.org/index.php?path=Main%2FDownloads"; + sourceRegexp = ''DirectFB-.*[.]tar[.].*''; + choiceCommand = ''tail -1''; +}