Commit Graph

152 Commits

Author SHA1 Message Date
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
0c74f18e4c xlibs.xlibs: remove
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
2015-09-15 11:59:33 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Eelco Dolstra
60a0bb7f66 Make "nix-env -i wine" work again
Also, make wine32 the default again to prevent a huge closure size
regression. (It recently grew by ~1 GB:
http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.wineStable.x86_64-linux#tabs-charts)

Issue #8990.
2015-08-25 13:07:16 +02:00
Herwig Hochleitner
440dde6950 wine: cleanup and comment build script 2015-08-06 00:27:32 +02:00
Herwig Hochleitner
e15a4b0ee2 wine: 1.7.47 -> 1.7.48 2015-08-06 00:21:31 +02:00
Nathaniel Baxter
196fcdf80f wine: unstable and staging update: 1.7.46 -> 1.7.47
Close #8913.
2015-07-30 13:48:58 +02:00
Nathaniel Baxter
148f7e6624 winetricks: update 20150416 -> 20150706 2015-07-30 13:48:58 +02:00
Michael Raskin
2e462069a8 Wine: unstable, staging: update 1.7.43 -> 1.7.46; remove updater scripts because with the new layout they don't work anyway 2015-07-05 00:32:54 +03:00
William A. Kennington III
be5f4082fd pulseaudio: Remove default derivation 2015-05-29 14:47:33 -07:00
Herwig Hochleitner
2f53355ff6 winetricks: 20150316 -> 20150416 2015-05-18 21:02:23 +02:00
Herwig Hochleitner
b4c2351806 wine: unstable 1.7.42 -> 1.7.43 2015-05-18 21:02:23 +02:00
Herwig Hochleitner
ef9cfd3dda wine: enable 64bit build for wineStaging 2015-05-18 21:01:54 +02:00
Herwig Hochleitner
ae6d2796bc wine: add 64 bit build and nixpkgs configuration
The default release channel (stable/unstable) and the default
build (wine32/wine64/wineWow) can be customized via the "wine" key in config
2015-05-10 15:45:01 +02:00
Michael Raskin
90453cc5ca Update Wine staging to match Wine unstable 2015-05-10 13:36:48 +03:00
Michael Raskin
ede1211cbc Update Wine unstable 2015-05-10 13:36:47 +03:00
Nikolay Amiantov
f6607ca4a5 wineStaging: add derivation 2015-04-23 21:00:42 +03:00
Michael Raskin
99b5486db6 Update Wine 2015-04-05 20:27:25 +03:00
Nikolay Amiantov
602ff46403 winetricks: update 2015-03-29 13:05:28 +03:00
Michael Raskin
d77a4f17f9 update wine 2015-03-21 21:29:39 +03:00
Nathaniel Baxter
358e9af3d3 wineUnstable: updates (close #6508) 2015-03-08 15:10:44 +01:00
Nikolay Amiantov
ca8137d4a8 winetricks: update 2015-02-19 02:12:09 +03:00
Michael Raskin
7a7572dc31 Update Wine unstable 2015-02-10 00:28:00 +03:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Michael Raskin
3566a73b5e Update wine-unstable 2015-02-01 18:41:33 +03:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Michael Raskin
41f0b9e851 Wine unstable: 1.7.33 -> 1.7.34 2015-01-11 16:43:29 +03:00
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