Commit graph

425 commits

Author SHA1 Message Date
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Michael Raskin 1317dd7e62 Wine: 1.7.30 → 1.7.33 2014-12-21 11:14:25 +03:00
Michael Raskin 9c458ad8d4 Update Wine-unstable 2014-11-02 23:51:58 +03:00
Michael Raskin 5199b46964 Update Wine unstable 2014-10-18 19:52:59 +04:00
Michael Raskin a451c62650 Update Wine unstable 2014-10-06 02:43:58 +04:00
Nathaniel Baxter d5f40ea929 wineUnstable: Fix dynamic loading of ncurses lib. 2014-09-24 12:48:39 +10:00
Nathaniel Baxter b99773fc00 wineUnstable: Bump version to 1.7.27 2014-09-23 21:47:47 +10:00
Nathaniel Baxter b94e33d7b8 wineUnstable: Bump version to 1.7.26 2014-09-22 20:18:30 +02:00
Michael Raskin 3bbf64b6d0 Update unstable Wine 2014-08-31 18:20:06 +04:00
Eelco Dolstra 8f3d2b740b wine: Update to 1.7.23 2014-08-04 01:09:01 +02:00
Michael Raskin 750a5f4e0c Update Wine-unstable 2014-08-03 22:29:41 +04:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra 429bdef9bd winetricks: Update to 1199 2014-06-25 00:51:41 +02:00
Vladimír Čunát 9757785295 Merge recent master 2014-06-15 17:55:35 +02:00
Michael Raskin 6bbd163df4 Update Wine unstable version 2014-06-14 00:23:11 +04:00
Vladimír Čunát 5a98b9f514 Merge recent master into p/stdenv
Merged just before the pypi update, as it seems to cause problems on Hydra.
2014-06-09 19:07:31 +02:00
Michael Raskin bc292a5882 Updating Wine unstable to 1.7.19 2014-05-28 01:33:28 +04:00
Ricardo M. Correia a0f683686c wine: Add support for grsecurity 2014-05-15 13:25:49 +02:00
Evgeny Egorochkin 531f7f56bc wineUnstable: update from 1.7.12 to 1.7.14 2014-03-08 17:51:45 +02:00
Evgeny Egorochkin 97be6e295c wineUnstable: update from 1.7.11 to 1.7.12 2014-02-14 21:16:22 +02:00
Evgeny Egorochkin 862ac34bdd wineUnstable: update from 1.7.10 to 1.7.11 2014-01-23 21:04:01 +02:00
Peter Simons 56aa2ce960 Un-maintain wine. 2014-01-13 17:15:53 +01:00
Vladimír Čunát a00e382e23 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 ;-)
2014-01-11 19:58:16 +01:00
Michael Raskin e89aa035b9 Update Wine 2014-01-04 14:55:42 +04:00
Michael Raskin 9817df5715 Update Winetricks 2014-01-01 14:25:17 +04:00
Michael Raskin 26b3d0ab50 Update unstable Wine to 1.7.9 2013-12-30 02:32:19 +04:00
Vladimír Čunát 4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Nixpkgs Monitor 6f17df861e wineUnstable: update from 1.7.7 to 1.7.8 2013-12-18 18:18:39 +02:00
Vladimír Čunát 1d6c351046 enable osmesa for wine (close #1228) 2013-12-10 16:36:23 +01:00
Moritz Ulrich 2d6c240913 winetricks: Update to rev 1078
And add some missing dependencies to the PATH of the script.
2013-12-09 00:34:35 +00:00
Michael Raskin 435cffee5b Update unstable Wine to 1.7.7 2013-11-25 10:59:38 +04:00
Vladimír Čunát b5356f7f27 wine: (stable) bugfix update 1.6 -> 1.6.1
Tested on a couple of apps.
2013-11-16 18:22:16 +01:00
Michael Raskin ae39f6c0cb Make 1.6 the default Wine version and call 1.7.4 wineUnstable 2013-10-21 21:27:18 +04:00
Michael Raskin 6f3e7d17d3 Fix Wine source 2013-10-20 22:02:02 +04:00
Michael Raskin c4d78d376a Updating Wine to 1.7.4 2013-10-20 21:08:42 +04:00
Mathijs Kwik f918e06988 wine: upgrade to 1.6 + latest gecko/mono extensions 2013-07-30 14:25:10 +02:00
Michael Raskin 8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/misc/emulators/wine/default.nix
2013-06-10 10:04:46 +04:00
Evgeny Egorochkin 8a7bd8b200 Wine: a crude fix to issue #542: "libgcc_s.so.1 must be installed for pthread_cancel to work". 2013-06-09 05:37:47 +03:00
Michael Raskin 3fe8b9451a Update Wine 2013-06-07 10:27:19 +04:00
Michael Raskin 8615f6ef35 Update Wine 2013-06-07 10:23:48 +04:00
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Michael Raskin 0c020c98f9 Updates: Wine, SBCL, XBoard 2013-05-08 10:52:47 +04:00
Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Michael Raskin b98ece6bc2 Auto-update some packages; no early build failures (SBCL and Wine not yet fully built) 2013-04-23 09:15:48 +04:00
Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Moritz Ulrich 51229692ca Add sha256 hash to winetricks.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-30 20:00:05 +01:00
Michael Raskin e9439d7811 Fix Wine libDRM reference 2013-03-29 09:29:19 +04:00
Michael Raskin c8acc350b9 Wine: update to 1.5.25 2013-03-07 00:28:59 +04:00
Corey O'Connor fde87b3a9b add winetricks, modified by vcunat@gmail.com
Originally from #89.
2013-02-10 16:20:24 +01:00
Vladimír Čunát 0fa7bc7379 wine: update to 1.5.23, update gecko 2013-02-02 15:03:02 +01:00
Evgeny Egorochkin 5dcdcf4af3 Remove Wine-Warcraft because WarCraft 3 works just fine in vanilla Wine now. 2013-01-15 07:43:40 +02:00
Michael Raskin 029d4fd1db Wine: Update to 1.5.21 2013-01-07 01:35:58 +04:00
Michael Raskin 17a4e01c69 Wine: update to 1.5.20 2012-12-22 14:54:22 +04:00
Michael Raskin 50f368c0ec Update Wine 2012-12-08 13:28:15 +04:00
Evgeny Egorochkin 21379504a4 Wine: add printing(cups) support 2012-12-03 17:02:01 +02:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Michael Raskin 3061db0bb2 Wine: update, add auto-update helper 2012-11-10 14:43:17 +04:00
Michael Raskin 07f44ad945 Update Wine 2012-10-17 17:22:32 +04:00
Michael Raskin 2a2b52201e Wine: update to 1.5.10 2012-08-09 12:55:30 +04:00
Eelco Dolstra 0435f39008 wine: Update to 1.5.9 2012-07-22 01:18:02 -04:00
Peter Simons f7a95ce194 wine: update to version 1.5.5
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 16:53:51 +02:00
Michael Raskin 279e5fb324 Update Wine
svn path=/nixpkgs/trunk/; revision=30366
2011-11-10 04:31:52 +00:00
Eelco Dolstra fc77db6d21 * Wine 1.3.29.
svn path=/nixpkgs/trunk/; revision=29617
2011-10-03 20:42:45 +00:00
Michael Raskin ce77d02c9e Update Wine
svn path=/nixpkgs/trunk/; revision=28844
2011-08-27 07:22:17 +00:00
Eelco Dolstra ae6fa8071f * Wine updated to 1.3.26.
svn path=/nixpkgs/trunk/; revision=28209
2011-08-06 23:26:38 +00:00
Michael Raskin 6e2572440a Update Wine
svn path=/nixpkgs/trunk/; revision=28126
2011-08-02 18:58:42 +00:00
Michael Raskin db4fdfec67 Update Wine
svn path=/nixpkgs/trunk/; revision=27416
2011-06-11 07:26:37 +00:00
Michael Raskin 9926941bf2 Fixing forgotten hash for Wine update
svn path=/nixpkgs/trunk/; revision=27065
2011-04-30 19:42:48 +00:00
Michael Raskin bb809bb2c3 Update Wine
svn path=/nixpkgs/trunk/; revision=27063
2011-04-30 16:32:53 +00:00
Peter Simons edfedf6736 pkgs/misc/emulators/wine: enable Hydra builds on x86_64-linux
Wine is supposed to compile on both 32 and 64-bit Linux. When I try to build
it in a 64 bit environment, however, the build fails while compiling libgmp,
saying that the C compiler in bootstrap-tools doesn't support C++. I'm not
sure why that happens. Hopefully, the builds in Hydra give me some clue
about this phenomenon.

svn path=/nixpkgs/trunk/; revision=25693
2011-01-26 15:39:40 +00:00
Michael Raskin 961c737634 Update Wine
svn path=/nixpkgs/trunk/; revision=24892
2010-11-27 18:41:49 +00:00
Evgeny Egorochkin 6748294477 wine-warcraft: add missing deps
svn path=/nixpkgs/trunk/; revision=24683
2010-11-14 08:57:42 +00:00
Evgeny Egorochkin a1b688cbfd Wine-Warcraft: minor cleanup
svn path=/nixpkgs/trunk/; revision=24307
2010-10-15 20:06:20 +00:00
Michael Raskin d61a0a42ca Update wine
svn path=/nixpkgs/trunk/; revision=24166
2010-10-08 05:33:59 +00:00
Peter Simons 8b37e1a514 pkgs/misc/emulators/wine: enable multi-threaded builds
svn path=/nixpkgs/trunk/; revision=24051
2010-10-04 11:51:17 +00:00
Peter Simons 94826ffee2 pkgs/misc/emulators/wine: encode paths to libpng and libjpeg in RPATH to ensure that WINE will find them at run-time
svn path=/nixpkgs/trunk/; revision=24050
2010-10-04 11:51:10 +00:00
Peter Simons fb4249da1a pkgs/misc/emulators/wine: add support for gecko HTML rendering engine
svn path=/nixpkgs/trunk/; revision=24021
2010-10-01 13:45:19 +00:00
Peter Simons 30eddde3f5 pkgs/misc/emulators/wine: added support for gnutls
svn path=/nixpkgs/trunk/; revision=24020
2010-10-01 13:45:12 +00:00
Peter Simons 0a0fe89bf7 pkgs/misc/emulators/wine: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=24019
2010-10-01 13:45:02 +00:00
Evgeny Egorochkin 3cc7d2ed7c Wine-Warcraft: finally it works
svn path=/nixpkgs/trunk/; revision=23993
2010-09-30 09:01:04 +00:00
Evgeny Egorochkin e91ff5eabd Wine with patches for Warcraft 3
svn path=/nixpkgs/trunk/; revision=23933
2010-09-26 05:05:18 +00:00
Michael Raskin 93e22996b1 Update Wine
svn path=/nixpkgs/trunk/; revision=23887
2010-09-21 21:43:32 +00:00
Michael Raskin 21580dc847 Update Wine
svn path=/nixpkgs/trunk/; revision=22866
2010-08-02 10:02:23 +00:00
Eelco Dolstra 9fa00f1a76 * Wine 1.2rc7.
svn path=/nixpkgs/trunk/; revision=22555
2010-07-12 09:17:27 +00:00
Eelco Dolstra 76143618b6 svn path=/nixpkgs/trunk/; revision=22059 2010-05-30 19:03:26 +00:00
Michael Raskin 1975b1e1af Update Wine to 1.2-rc1
svn path=/nixpkgs/trunk/; revision=22025
2010-05-28 05:09:32 +00:00
Michael Raskin 09e05eb46a Update wine
svn path=/nixpkgs/trunk/; revision=20816
2010-03-25 07:55:11 +00:00
Michael Raskin 3f30914672 Update wine dependency on flex and add myself as maintainer
svn path=/nixpkgs/trunk/; revision=19433
2010-01-14 13:17:40 +00:00
Michael Raskin 98bf3aef49 Update Wine
svn path=/nixpkgs/trunk/; revision=19428
2010-01-14 10:09:08 +00:00
Michael Raskin 67ed6bf75b Update wine
svn path=/nixpkgs/trunk/; revision=18988
2009-12-16 09:26:55 +00:00
Michael Raskin 742dcbc12e Update Wine
svn path=/nixpkgs/trunk/; revision=17947
2009-10-23 23:27:59 +00:00
Michael Raskin f0a3ff997f Update wine (use new updater script in the process)
svn path=/nixpkgs/trunk/; revision=16817
2009-08-23 22:24:17 +00:00
Eelco Dolstra 83c3123617 * Wine 1.1.23.
svn path=/nixpkgs/trunk/; revision=15886
2009-06-07 19:48:49 +00:00
Eelco Dolstra 5a2284ac61 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15313
2009-04-25 22:45:32 +00:00
Lluís Batlle i Rossell 1e8fff0915 Updating Wine.
svn path=/nixpkgs/trunk/; revision=15308
2009-04-25 16:22:08 +00:00
Eelco Dolstra 6e32a4cea8 svn path=/nixpkgs/branches/stdenv-updates/; revision=15273 2009-04-23 12:46:14 +00:00
Eelco Dolstra 0175270bf9 * Wine 1.1.15.
svn path=/nixpkgs/trunk/; revision=14273
2009-02-27 12:52:55 +00:00
Eelco Dolstra 9ed6e06b38 * Wine 1.1.10.
svn path=/nixpkgs/trunk/; revision=13625
2008-12-12 23:00:15 +00:00
Eelco Dolstra 2ffc686b67 * Latest Wine, Thunderbird.
svn path=/nixpkgs/trunk/; revision=13527
2008-12-01 00:06:14 +00:00
Michael Raskin 89c807afc1 Wine update
svn path=/nixpkgs/trunk/; revision=13128
2008-10-28 07:28:39 +00:00
Eelco Dolstra 813c7e87f6 * Wine updated to 1.1.2.
svn path=/nixpkgs/trunk/; revision=12638
2008-08-15 21:54:19 +00:00
Eelco Dolstra be77e6f99f * Wine 1.1.1.
svn path=/nixpkgs/trunk/; revision=12352
2008-07-13 21:42:10 +00:00
Michael Raskin dcb7d72481 Wine update
svn path=/nixpkgs/trunk/; revision=12226
2008-07-01 03:44:26 +00:00
Eelco Dolstra aab9aee56e * Wine 1.0. ZOMG!
svn path=/nixpkgs/trunk/; revision=12142
2008-06-18 07:23:53 +00:00
Eelco Dolstra 02f18d5743 * Wine 1.0rc4.
svn path=/nixpkgs/trunk/; revision=12079
2008-06-13 15:34:44 +00:00
Eelco Dolstra eeb82eb2df * Wine 1.0rc2.
svn path=/nixpkgs/trunk/; revision=11932
2008-05-29 15:36:15 +00:00
Tobias Hammerschmidt 4e57926353 wine 0.9.60
svn path=/nixpkgs/trunk/; revision=11659
2008-04-18 21:08:38 +00:00
Tobias Hammerschmidt 0592ed6a11 version update
svn path=/nixpkgs/trunk/; revision=11268
2008-03-22 20:49:15 +00:00
Tobias Hammerschmidt 5693576572 wine 0.9.57
svn path=/nixpkgs/trunk/; revision=11071
2008-03-12 09:50:36 +00:00
Tobias Hammerschmidt ff283876db wine 0.9.56
svn path=/nixpkgs/trunk/; revision=10855
2008-02-25 19:54:31 +00:00
Eelco Dolstra 6e3afdf7da * Wine 0.9.55.
svn path=/nixpkgs/trunk/; revision=10663
2008-02-13 19:22:41 +00:00
Eelco Dolstra 960f599215 * Wine 0.9.54.
svn path=/nixpkgs/trunk/; revision=10554
2008-02-08 13:12:13 +00:00
Wouter den Breejen 8dd525ab17 Updated wine to 0.9.53. I have tested that it builds.
svn path=/nixpkgs/trunk/; revision=10144
2008-01-14 22:33:05 +00:00
Wouter den Breejen 8e25a7d6c9 Updated wine to 9.49
svn path=/nixpkgs/trunk/; revision=9747
2007-11-17 16:12:39 +00:00
Michael Raskin 1bfaf17b14 Bumped Wine version
svn path=/nixpkgs/trunk/; revision=9393
2007-10-02 20:06:24 +00:00
Eelco Dolstra 44690411ef * Add fontconfig to Wine's RPATH.
svn path=/nixpkgs/trunk/; revision=9228
2007-08-31 12:14:36 +00:00
Eelco Dolstra 607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Eelco Dolstra c9bd5b7397 * Add Wine to the channel.
svn path=/nixpkgs/trunk/; revision=9191
2007-08-24 11:37:07 +00:00
Eelco Dolstra 2f21c59a3f * Use FontForge to give Wine better fonts.
svn path=/nixpkgs/trunk/; revision=9181
2007-08-21 12:31:33 +00:00
Eelco Dolstra 0481f172f6 * Assert Linux.
svn path=/nixpkgs/trunk/; revision=9179
2007-08-21 10:16:34 +00:00
Eelco Dolstra 3a3a9183a1 * Patch to fix Baldur's Gate 2 and other programs. See
http://bugs.winehq.org/show_bug.cgi?id=6975 and
  http://bugs.winehq.org/show_bug.cgi?id=2398.
  Based on http://bugs.winehq.org/attachment.cgi?id=5708.

svn path=/nixpkgs/trunk/; revision=9178
2007-08-21 09:10:20 +00:00
Eelco Dolstra 38ace454e9 * 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.

svn path=/nixpkgs/trunk/; revision=9177
2007-08-21 00:00:23 +00:00
Eelco Dolstra a8bd020fe0 * Get Wine to work (basically) by linking it against Glibc 2.6 with
NPTL.  Apparently Wine doesn't work with Glibc 2.5 + LinuxThreads.

svn path=/nixpkgs/trunk/; revision=9165
2007-08-18 23:58:30 +00:00
Michael Raskin a00cf21e28 Added broken wine expression. Builds, segfaults.
svn path=/nixpkgs/trunk/; revision=9080
2007-08-09 16:39:04 +00:00