From 5dcdcf4af38bda591f8b11926cbe50b11fd4c855 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Tue, 15 Jan 2013 07:42:35 +0200
Subject: [PATCH] Remove Wine-Warcraft because WarCraft 3 works just fine in
vanilla Wine now.
---
pkgs/misc/emulators/wine/wine-warcraft.nix | 49 ----------------------
pkgs/top-level/all-packages.nix | 2 -
2 files changed, 51 deletions(-)
delete mode 100644 pkgs/misc/emulators/wine/wine-warcraft.nix
diff --git a/pkgs/misc/emulators/wine/wine-warcraft.nix b/pkgs/misc/emulators/wine/wine-warcraft.nix
deleted file mode 100644
index 3573c0ba4fe..00000000000
--- a/pkgs/misc/emulators/wine/wine-warcraft.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ 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;
-
-stdenv.mkDerivation rec {
- name = "wine-warcraft-${version}";
- version = "1.1.19";
-
- 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
- xlibs.xf86vidmodeproto
- 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 xlibs.libXxf86vm
- xlibs.xf86vidmodeproto
- openssl gnutls
- ];
-
- # Don't shrink the ELF RPATHs in order to keep the extra RPATH
- # elements specified above.
- dontPatchELF = true;
-
- 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 with patches for Warcraft 3";
- maintainers = [ maintainers.phreedom ];
- platforms = [ "i686-linux" ];
- };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7e84af2332..64119eda2aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9157,8 +9157,6 @@ let
# Wine cannot be built in 64-bit; use a 32-bit build instead.
wine = callPackage_i686 ../misc/emulators/wine { };
- wineWarcraft = callPackage_i686 ../misc/emulators/wine/wine-warcraft.nix { };
-
x2x = callPackage ../tools/X11/x2x { };
xosd = callPackage ../misc/xosd { };