Updating from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
parent 8d435fd90f e99b3198fa
commit cd4b54748a
111 changed files with 2109 additions and 903 deletions
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -15,9 +15,11 @@ stdenv.mkDerivation {
  #'';

  prePatch = ''
-    sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in 
+    sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in
  '';

+  # --disable-network-build Until we have snmp
+
  preConfigure = ''
    export configureFlags="$configureFlags
      --with-cupsfilterdir=$out/lib/cups/filter
@@ -25,7 +27,6 @@ stdenv.mkDerivation {
      --with-icondir=$out/share/applications
      --with-systraydir=$out/xdg/autostart
      --with-mimedir=$out/etc/cups
-      # Until we have snmp
      --disable-network-build"

    export makeFlags="
@@ -39,9 +40,10 @@ stdenv.mkDerivation {
  buildInputs = [libjpeg cups libusb python saneBackends dbus pkgconfig] ++
    stdenv.lib.optional qtSupport qt4;

-  meta = {
+  meta = with stdenv.lib; {
    description = "Print, scan and fax HP drivers for Linux";
    homepage = http://hplipopensource.com/;
    license = "free"; # MIT/BSD/GPL
+    platforms = platforms.linux;
  };
 }
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib
 , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
-, libxml2, libxslt, openssl
+, libxml2, libxslt, openssl, gnutls
 }:

 assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;

-let 
+let
  s = import ./src-for-default.nix;
 in

@@ -18,12 +18,17 @@ stdenv.mkDerivation rec {
    sha256 = s.hash;
  };

+  gecko = fetchurl {
+    url = "http://downloads.sourceforge.net/wine/wine_gecko-1.1.0-x86.cab";
+    sha256 = "0a8bpqqhx146innrdwhn4c0jqi90mkmp8kw6aqwildm073yy31hp";
+  };
+
  buildInputs = [
    xlibs.xlibs flex bison xlibs.libXi mesa
    xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
    xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
    alsaLib ncurses libpng libjpeg lcms fontforge
-    libxml2 libxslt openssl
+    libxml2 libxslt openssl gnutls
  ];

  # Wine locates a lot of libraries dynamically through dlopen().  Add
@@ -33,13 +38,15 @@ stdenv.mkDerivation rec {
    freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm
    xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
    xlibs.libXcursor xlibs.libXcomposite
-    openssl
+    openssl gnutls
  ];

  # Don't shrink the ELF RPATHs in order to keep the extra RPATH
  # elements specified above.
  dontPatchELF = true;

+  postInstall = "install -D ${gecko} $out/share/wine/gecko/wine_gecko-1.1.0-x86.cab";
+
  meta = {
    homepage = "http://www.winehq.org/";
    license = "LGPL";
--- a/pkgs/misc/emulators/wine/src-for-default.nix
+++ b/pkgs/misc/emulators/wine/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.3.0";
-   name="wine-1.3.0";
-   hash="042mmkq55zgdz7617z7ihqvi9riqv0qc6c7z2f8f6nr5iavfviml";
+   version="1.3.3";
+   name="wine-1.3.3";
+   hash="1kpwcm3zqwxzwm9npipq80yfp7la6429vpg6sf4lvxc1z316wns5";
   url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
-   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.0.tar.bz2";
+   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.3.tar.bz2";
  
  
 }
--- a/pkgs/misc/emulators/wine/wine-warcraft.nix
+++ b/pkgs/misc/emulators/wine/wine-warcraft.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchgit, xlibs, flex, bison, mesa, alsaLib
+, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
+, libxml2, libxslt, openssl, gnutls
+}:
+
+assert stdenv.isLinux;
+assert stdenv.gcc.gcc != null;
+
+let 
+  s = import ./src-for-default.nix;
+in
+
+stdenv.mkDerivation rec {
+  name = "wine-warcraft-${s.version}";
+
+  src = fetchgit {
+    url = git://repo.or.cz/wine/warcraft3.git;
+    rev = "38faaffd99331b71284d8da5f76f38625107ed6d";
+  };
+
+  buildInputs = [
+    xlibs.xlibs flex bison xlibs.libXi mesa
+    xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
+    xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
+    alsaLib ncurses libpng libjpeg lcms fontforge
+    libxml2 libxslt openssl gnutls
+  ];
+
+  # Wine locates a lot of libraries dynamically through dlopen().  Add
+  # them to the RPATH so that the user doesn't have to set them in
+  # LD_LIBRARY_PATH.
+  NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
+    freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm
+    xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
+    xlibs.libXcursor xlibs.libXcomposite
+    openssl gnutls
+  ];
+
+  # Don't shrink the ELF RPATHs in order to keep the extra RPATH
+  # elements specified above.
+  dontPatchELF = true;
+
+  meta = {
+    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 ];
+    platforms = [ "i686-linux" ];
+  };
+}
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -7,13 +7,13 @@ assert x11Support -> x11 != null;
 assert cupsSupport -> cups != null;

 stdenv.mkDerivation rec {
-  name = "ghostscript-8.64.0";
+  name = "ghostscript-8.71.1";

  builder = ./builder.sh;

  src = fetchurl {
    url = "mirror://gnu/ghostscript/gnu-${name}.tar.bz2";
-    sha256 = "0b94vlf03saa8vm9drz1kishh527g0brw2cg3jcy9mgpp764x2v1";
+    sha256 = "0vab9905h6sl5s5miai4vhhwdacjlkxqmykfr42x32sr25wjqgvl";
  };

  fonts = [
@@ -32,19 +32,18 @@ stdenv.mkDerivation rec {
    ++ stdenv.lib.optional x11Support x11
    ++ stdenv.lib.optional cupsSupport cups;

-  configureFlags = ''
-    ${if x11Support then "--with-x" else "--without-x"}
-  '';
+  configureFlags =
+    if x11Support then [ "--with-x" ] else [ "--without-x" ];

-  NIX_CFLAGS_COMPILE = "-fpic";
+  CFLAGS = "-fPIC";

-  patches = [ ./purity.patch ./mkromfs-zlib.patch ./urw-font-files.patch ];
+  patches = [ ./purity.patch ./urw-font-files.patch ];

  doCheck = true;

  meta = {
    homepage = http://www.gnu.org/software/ghostscript/;
-    description = "GNU Ghostscript, an PostScript interpreter";
+    description = "GNU Ghostscript, a PostScript interpreter";

    longDescription = ''
      Ghostscript is the name of a set of tools that provides (i) an
@@ -55,6 +54,9 @@ stdenv.mkDerivation rec {
      of output drivers for various file formats and printers.
    '';

-    license = "GPLv2";
+    license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
  };
 }
--- a/pkgs/misc/ghostscript/mkromfs-zlib.patch
+++ b/pkgs/misc/ghostscript/mkromfs-zlib.patch
@@ -1,13 +0,0 @@
-Current makefiles stupidly omit `-lz' when building `mkromfs'.
-
--- gnu-ghostscript-8.64.0/base/unix-aux.mak	2008-05-04 16:34:47.000000000 +0200
-+++ gnu-ghostscript-8.64.0/base/unix-aux.mak	2008-07-17 17:58:20.000000000 +0200
-@@ -97,7 +97,7 @@ MKROMFS_OBJS= $(MKROMFS_ZLIB_OBJS) $(GLO
- endif
- 
- $(MKROMFS_XE): $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS)
-	$(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE) $(MKROMFS_OBJS) -lm $(EXTRALIBS)
-+	$(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE) $(MKROMFS_OBJS) -lm $(EXTRALIBS) -lz
- 
- # Query the environment to construct gconfig_.h.
- # The "else true;" is required because Ultrix's implementation of sh -e
--- a/pkgs/misc/xsane/default.nix
+++ b/pkgs/misc/xsane/default.nix
@@ -14,4 +14,8 @@ stdenv.mkDerivation {

  buildInputs = [saneBackends saneFrontends libX11 gtk pkgconfig ] ++
 	(if (libusb != null) then [libusb] else []);
+
+  meta = {
+    homepage = http://www.sane-project.org/;
+  };
 }