Updating from trunk

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

pkgs/misc/sane-front/default.nix

@@ -8,6 +8,10 @@ stdenv.mkDerivation {
     md5 = "c63bf7b0bb5f530cf3c08715db721cd3";
   };
 
+  preConfigure = ''
+    sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
+  '';
+
   buildInputs = [saneBackends libX11 gtk pkgconfig] ++ 
 	(if (libusb != null) then [libusb] else []);
 }

pkgs/misc/source-and-tags/default.nix

@@ -54,7 +54,7 @@ args: with args; {
                  # tagCmd = "${toString ghcsAndLibs.ghc68.ghc}/bin/hasktags --ignore-close-implementation --ctags `find . -type f -name \"*.*hs\"`; sort tags > \$TAG_FILE"; }
                  # *.*hs.* to catch gtk2hs .hs.pp files
                  tagCmd = "
-                   srcs=\"`find . -type f -name \"*.*hs\"; find . -type f -name \"*.*hs.*\";`\"
+                   srcs=\"`find . -type f -name \"*.*hs\"; find . -type f -name \"*.*hs*\";`\"
                    [ -z \"$srcs\" ] || {
                     ${toString hasktags}/bin/hasktags-modified --ignore-close-implementation --ctags $srcs
                     sort tags > \$TAG_FILE

pkgs/misc/xsane/default.nix

@@ -8,6 +8,10 @@ stdenv.mkDerivation {
     sha256 = "0zddar0y76iv4c55qzfmnm819z5hzisr2jwjb60x36v6bdrhcjx5";
   };
 
+  preConfigure = ''
+    sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/xsane-back-gtk.c
+  '';
+
   buildInputs = [saneBackends saneFrontends libX11 gtk pkgconfig ] ++
 	(if (libusb != null) then [libusb] else []);
 }