Merging from trunk. I resolved some conflicts; I hope that well.

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

pkgs/misc/emulators/wine/wine-warcraft.nix

@@ -6,12 +6,9 @@
 assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
-let 
-  s = import ./src-for-default.nix;
-in
-
 stdenv.mkDerivation rec {
-  name = "wine-warcraft-${s.version}";
+  name = "wine-warcraft-${version}";
+  version = "1.1.19";
 
   src = fetchgit {
     url = git://repo.or.cz/wine/warcraft3.git;
@@ -40,11 +37,11 @@ stdenv.mkDerivation rec {
   # elements specified above.
   dontPatchELF = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://www.winehq.org/";
     license = "LGPL";
-    description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix with patches for Warcraft 3";
+    maintainers = [ maintainers.phreedom ];
     platforms = [ "i686-linux" ];
   };
 }

pkgs/misc/sane-backends/default.nix

@@ -1,6 +1,8 @@
 { stdenv, fetchurl, hotplugSupport ? false, libusb ? null
 , gt68xxFirmware ? null }:
-
+let
+  firmware = gt68xxFirmware {inherit fetchurl;};
+in
 assert hotplugSupport -> stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
@@ -24,8 +26,7 @@ stdenv.mkDerivation {
 
   preInstall =
     if gt68xxFirmware != null then 
-      "mkdir -p \${out}/share/sane/gt68xx ; ln -s " +  
-      (gt68xxFirmware {inherit fetchurl;}) +
-      "  \${out}/share/sane/gt68xx/PS1fw.usb "
+      "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
+      " \${out}/share/sane/gt68xx/" + firmware.name
     else "";
 }