Merging from trunk.

I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912

pkgs/tools/cd-dvd/cdrkit/default.nix

@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [cmake libcap zlib bzip2];
 
+  patches = [ ./include-path.patch ];
+
   postInstall = ''
     # file name compatibility with the old cdrecord (growisofs wants this name)
     ln -s $out/bin/genisoimage $out/bin/mkisofs

pkgs/tools/cd-dvd/cdrkit/include-path.patch

@@ -0,0 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 57edba6..d06b6d9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,4 @@
+ PROJECT (cdrkit C)
++INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
+ SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
+ 

pkgs/tools/package-management/nix-repository-manager/default.nix

@@ -1,78 +0,0 @@
-{lib, bleedingEdgeRepos, writeText, ghcReal, getConfig, stdenv, writeScriptBin }:
-
-/* usage
-   see pkgs/development/misc/bleeding-edge-repos/default.nix [1]
-   and pkgs/misc/bleeding-edge-fetch-infos.nix
-
-   Either add repository definitions which can be used by sourceByName "foo"
-   to [1] or config.nix. Example:
-
-   bleedingEdgeRepos = {
-     useLocalRepos = true; # prefer local dist file if availible
-
-     repos = {
-        # the attr names are equal to the repo IDs [2]
-        getOptions = { type="darcs"; url="http://repetae.net/john/repos/GetOptions"; };
-        nobug = { type = "git"; url="git://git.pipapo.org/nobug"; };
-        anyterm = { type = "svn"; url="http://svn.anyterm.org/anyterm/tags/releases/1.1/1.1.25/"; };
-        gnash = { type = "cvs"; cvsRoot=":pserver:anonymous@cvs.sv.gnu.org:/sources/gnash"; module="gnash"; };
-        octave = { type = "hg"; url="http://www.octave.org/hg/octave"; groups="octave_group"; };
-     };
-   };
-
-
-   to fetch / update the repository given by ID [2] use:
-   $ run-nix-repository-manager-with-config [$PATH_TO_NIXPKGS] --update ID
-   This will also calculate the current hash of the dist file which will be
-   saved to $PATH_TO_NIXPKGS/pkgs/misc/bleeding-edge-fetch-infos.nix.
-
-   Distribute the dist file which is stored in ~/managed_repos/dist using
-   $ run-nix-repository-manager-with-config --publish ID
-   this will upload the file to my server. Contact MarcWeber to get login data.
-   It should be easy to add multiple mirror locations instead (?)
-
-   You can add groups="xorg"; as seen above to update / distribute all
-   packages belonging to that group.
-*/
-
-let
-  inherit (builtins) getAttr attrNames;
-  inherit (lib) concatStringsSep mapAttrsFlatten;
-  toConfigLine = name : set : 
-    "[(\"name\",\"${name}\")," + ( concatStringsSep "," (map (a: "(\"${a}\",\"${getAttr a set}\")" ) (attrNames set)))+"]";
-  config = writeText "nix-repository-manager_config"
-        (bleedingEdgeRepos.managedRepoDir+"\n" +
-        concatStringsSep "\n" (mapAttrsFlatten toConfigLine (bleedingEdgeRepos.repos)));
-
-  cfg = getConfig ["nixRepositoryManager" ] {};
-
-  provideSource = if (builtins.hasAttr "sourcefile" cfg) then
-     "cp ${cfg.sourcefile} source.hs "
-    else ''
-      src="${bleedingEdgeRepos.sourceByName "nix_repository_manager"}"
-      unpackPhase
-      mv nix_repsoitory_manager_tmp_dir/nix-repository-manager.hs source.hs
-    '';
-
-  nixRepositoryManager = stdenv.mkDerivation {
-    name = "nix-repository-manager";
-
-    phases="buildPhase";
-    buildPhase = ''
-      ${provideSource}
-      ensureDir $out/bin
-      ghc --make source.hs -o $out/bin/nix-repository-manager
-    '';
-
-    buildInputs = [ ghcReal ];
-
-    meta = { 
-        description = "makes it easy to keep some packages up to date";
-        license = "GPL";
-    };
-  };
-in writeScriptBin "run-nix-repository-manager-with-config" 
-''
-#!/bin/sh
-exec ${nixRepositoryManager}/bin/nix-repository-manager ${config} $@
-''

pkgs/tools/video/mjpegtools/default.nix

@@ -7,4 +7,9 @@ stdenv.mkDerivation {
     sha256 = "1xvgqzdb2rw6j4ss65k4hrzrbsl74p7k5l4qgf5dbfcw522kw7lb";
   };
   buildInputs = [libjpeg libX11];
+  patches = [ ( fetchurl {
+      url = "http://bugs.gentoo.org/attachment.cgi?id=145622";
+      sha256 = "0c3bdrkr0qsrd3jybzz84z9gs4bq90rvxg87ffw08149v5qjz7a1";
+      name = "patch.patch";
+  } ) ]; # from gentoo. Don't know why it broke. Make it compile again.
 }