From 96ddccf6b2eff303d36c72603557c0bbb3e0993d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 18 Feb 2008 07:23:05 +0000 Subject: [PATCH] Some fixes to build elfutils and ltrace, added x11vnc, forward-ported kernel 2.6.23.16 as default. svn path=/nixpkgs/branches/stdenv-updates/; revision=10718 --- .../development/tools/misc/elfutils/0.127.nix | 1 + .../development/tools/misc/elfutils/0.131.nix | 2 + pkgs/os-specific/linux/kernel/2.6.23.16.nix | 39 +++++++++++++++++++ pkgs/os-specific/linux/kernel/default.nix | 3 +- pkgs/tools/X11/x11vnc/0.9.3.nix | 27 +++++++++++++ pkgs/top-level/all-packages.nix | 9 +++++ 6 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/2.6.23.16.nix create mode 100644 pkgs/tools/X11/x11vnc/0.9.3.nix diff --git a/pkgs/development/tools/misc/elfutils/0.127.nix b/pkgs/development/tools/misc/elfutils/0.127.nix index efa91fa637c0..198242e27087 100644 --- a/pkgs/development/tools/misc/elfutils/0.127.nix +++ b/pkgs/development/tools/misc/elfutils/0.127.nix @@ -7,4 +7,5 @@ stdenv.mkDerivation { sha256 = "12n3h5r3c24a6l2wxz0w2dqq072bvgms0dzckivrwp5vdn22lpdv"; }; preBuild = "sed -e 's/-Werror//' -i */Makefile "; + dontAddDisableDepTrack = "true"; } diff --git a/pkgs/development/tools/misc/elfutils/0.131.nix b/pkgs/development/tools/misc/elfutils/0.131.nix index 5efe046493db..f2ba07ba0077 100644 --- a/pkgs/development/tools/misc/elfutils/0.131.nix +++ b/pkgs/development/tools/misc/elfutils/0.131.nix @@ -6,4 +6,6 @@ stdenv.mkDerivation { url = http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.131.orig.tar.gz; sha256 = "0vqfjpcv81m3q0gsk78qykakhz9rbfwd65i4zsi03xr2lrk9ayll"; }; + dontAddDisableDepTrack = "true"; + preBuild = "sed -e 's/-Werror//' -i */Makefile "; } diff --git a/pkgs/os-specific/linux/kernel/2.6.23.16.nix b/pkgs/os-specific/linux/kernel/2.6.23.16.nix new file mode 100644 index 000000000000..454ce9bf31ff --- /dev/null +++ b/pkgs/os-specific/linux/kernel/2.6.23.16.nix @@ -0,0 +1,39 @@ +args: +(import ./meta.nix) +( args // + { + version = "2.6.23.16"; + src_hash = { sha256 = "0drk3981rl5j16s6amb63lai9kpi0vf0kr6avhpd9nikj27bsa83"; }; + + systemPatches = [ + /*{ # resume with resume=swap:/dev/xx + name = "tux on ice"; # (swsusp2) + patch = args.fetchurl { + url = "http://www.tuxonice.net/downloads/all/tuxonice-3.0-rc3-for-2.6.23.9.patch.bz2"; + sha256 = "16f61cn0mdi7yklhdx4isi7c85843fzxq2cifd05cpsl6x6ilrfk"; + }; + extraConfig = " + CONFIG_SUSPEND2=y + CONFIG_SUSPEND2_FILE=y + CONFIG_SUSPEND2_SWAP=y + CONFIG_CRYPTO_LZF=y + "; + }*/ + { name = "fbsplash-0.9.2-r5-2.6.21"; + patch = args.fetchurl { + url = http://dev.gentoo.org/~dsd/genpatches/trunk/2.6.22/4200_fbsplash-0.9.2-r5.patch; + sha256 = "0822wwlf2dqsap5qslnnp0yl1nbvvvb76l73w2dd8zsyn0bqg3px"; + }; + extraConfig = "CONFIG_FB_SPLASH=y"; + } + ]; + + config = with args; + if config != null then config else + if userModeLinux then ./config-2.6.23-uml else + if stdenv.system == "i686-linux" then ./config-2.6.23-i686-smp else + if stdenv.system == "x86_64-linux" then ./config-2.6.23-x86_64-smp else + abort "No kernel configuration for your platform!"; + } +) + diff --git a/pkgs/os-specific/linux/kernel/default.nix b/pkgs/os-specific/linux/kernel/default.nix index c07bc4c81fb0..61e3c43aeaa9 100644 --- a/pkgs/os-specific/linux/kernel/default.nix +++ b/pkgs/os-specific/linux/kernel/default.nix @@ -27,5 +27,6 @@ args.stdenv.lib.listOfListsToAttrs [ [ "2.6.22-ck" (import ./2.6.22-ck.nix newArgs) ] [ "2.6.23" (import ./2.6.23.nix newArgs) ] [ "2.6.23.1" (import ./2.6.23.1.nix newArgs) ] - [ "default" (import ./2.6.23.1.nix newArgs) ] + [ "2.6.23.16" (import ./2.6.23.16.nix newArgs) ] + [ "default" (import ./2.6.23.16.nix newArgs) ] ] diff --git a/pkgs/tools/X11/x11vnc/0.9.3.nix b/pkgs/tools/X11/x11vnc/0.9.3.nix new file mode 100644 index 000000000000..6a58d5b55080 --- /dev/null +++ b/pkgs/tools/X11/x11vnc/0.9.3.nix @@ -0,0 +1,27 @@ +args : with args; with builderDefs {src="";} null; + let localDefs = builderDefs (rec { + src = /* put a fetchurl here */ + fetchurl { + url = mirror://sourceforge/libvncserver/x11vnc-0.9.3.tar.gz; + sha256 = "0sfzkbqd2d94w51czci9w5j5z67amcl1gphgg6x77dyr2h46kc0a"; + }; + + buildInputs = [libXfixes fixesproto openssl libXdamage damageproto + zlib libX11 xproto libjpeg libXtst libXinerama xineramaproto + libXrandr randrproto libXext xextproto inputproto recordproto]; + configureFlags = []; + }) null; /* null is a terminator for sumArgs */ + in with localDefs; +stdenv.mkDerivation rec { + name = "x11vnc-"+version; + builder = writeScript (name + "-builder") + (textClosure localDefs + [doConfigure doMakeInstall doForceShare doPropagate]); + meta = { + description = " + X11 VNC - VNC server connected to real X11 screen. +"; + homepage = "http://www.karlrunge.com/x11vnc/"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b34b8f0bfe9d..c30e97a4bece 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4822,6 +4822,15 @@ rec { ++ lib.optional (supportsJDK && jrePlugin ? mozillaPlugin) jrePlugin; }; + x11vncFun = lib.sumArgs (selectVersion ../tools/X11/x11vnc "0.9.3") { + inherit builderDefs openssl zlib libjpeg ; + inherit (xlibs) libXfixes fixesproto libXdamage damageproto + libX11 xproto libXtst libXinerama xineramaproto libXrandr randrproto + libXext xextproto inputproto recordproto; + }; + + x11vnc = x11vncFun null; + xara = import ../applications/graphics/xara { inherit fetchurl stdenv autoconf automake libtool gettext cvs wxGTK pkgconfig libxml2 zip libpng libjpeg shebangfix perl freetype;