From 094947ba7312a56eea2595dbd91f0186e23779ab Mon Sep 17 00:00:00 2001
From: Domen Kožar <domen@dev.si>
Date: Thu, 9 Jan 2014 13:45:12 +0100
Subject: gnome_themes_standard: bump to 3.10.0 and move into gnome3 attrset

---
 pkgs/misc/themes/gnome-themes-standard/default.nix | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 pkgs/misc/themes/gnome-themes-standard/default.nix

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/themes/gnome-themes-standard/default.nix b/pkgs/misc/themes/gnome-themes-standard/default.nix
deleted file mode 100644
index f52b94138a48..000000000000
--- a/pkgs/misc/themes/gnome-themes-standard/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }:
-stdenv.mkDerivation {
-  name = "gnome-themes-standard";
-  src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/3.7/gnome-themes-standard-3.7.92.tar.xz";
-    sha256 = "0a1ed83c07f57b5b45b8f3817ca0ca14feecb56de505243c086fb306c88da8de";
-  };
-  
-  buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ];
-
-  preConfigure = ''
-    cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > loaders.cache
-    export GDK_PIXBUF_MODULE_FILE=`readlink -e loaders.cache`
-  '';
-}
\ No newline at end of file
-- 
cgit 1.4.1


From a00e382e237e31d4dea8fc158bbea006dffa4edd Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 11 Jan 2014 19:56:55 +0100
Subject: wineStable: maintenance update 1.6.1 -> .2, use lcms2

lcms2 is now supported according to the announcement, so I switched to it.
Tested on a steam game ;-)
---
 pkgs/misc/emulators/wine/stable.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/stable.nix b/pkgs/misc/emulators/wine/stable.nix
index 5bec6a310d19..c0643c78a59a 100644
--- a/pkgs/misc/emulators/wine/stable.nix
+++ b/pkgs/misc/emulators/wine/stable.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib
-, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
+, ncurses, libpng, libjpeg, lcms2, freetype, fontconfig, fontforge
 , libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper
 }:
 
@@ -7,12 +7,12 @@ assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
 let
-    version = "1.6.1";
+    version = "1.6.2";
     name = "wine-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "0k1qb8hhaf5mbb3jk0a37jx93mvlxpk5c4dslxhalp2mic42rg6m";
+      sha256 = "1gmc0ljgfz3qy50mdxcwwjcr2yrpz54jcs2hdszsrk50wpnrxazh";
     };
 
     gecko = fetchurl {
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
     xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa
     xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
     xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
-    alsaLib ncurses libpng libjpeg lcms fontforge
+    alsaLib ncurses libpng libjpeg lcms2 fontforge
     libxml2 libxslt openssl gnutls cups makeWrapper
   ];
 
-- 
cgit 1.4.1