diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-12 12:27:06 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-12 12:29:24 +0100 |
| commit | a2c316288c8f3714e57dc1037d7a993a2088ab18 (patch) | |
| tree | ee4af0b96a5bc0e55b92c8d76465b333a698a260 /pkgs/misc | |
| parent | 51713fbbfcaf819f176df8f3ce75f57880aeb690 (diff) | |
| parent | a0070a9157d7d145eed22160cec2562d24032013 (diff) | |
| download | nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.gz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.bz2 nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.lz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.xz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.zst nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.zip | |
Merge master into stdenv-updates
Conflicts: pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved) pkgs/top-level/all-packages.nix (trivial)
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/wine/stable.nix | 8 | ||||
| -rw-r--r-- | pkgs/misc/themes/gnome-themes-standard/default.nix | 15 |
2 files changed, 4 insertions, 19 deletions
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 ]; 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 |