Commit graph

927 commits

Author SHA1 Message Date
Aaron Andersen
4ece8498dc dolphinEmu: fix broken build 2019-09-09 22:48:32 -04:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g
GTK was renamed.
2019-09-06 02:54:53 +02:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
worldofpeace
fa29f98bb5
Merge pull request #67368 from tadeokondrak/wine-4.0.2
wine{,-mono,-unstable,-staging}: update
2019-08-27 15:05:07 -04:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Tadeo Kondrak
58d383a5dc
wine{,-mono,-unstable,-staging}: update
wine: 4.0.1 -> 4.0.2
wine-mono: 4.9.0 -> 4.9.2
wine-unstable: 4.12.1 -> 4.14
wine-staging: 4.12.1 -> 4.14
2019-08-23 14:25:12 -06:00
ash lea
fe9e1854cc dolphinEmuMaster: update to latest upstream 2019-08-23 02:41:36 -07:00
ash lea
44b0d3ff6b dolphinEmuMaster: add ashkitten as maintainer 2019-08-23 02:41:36 -07:00
ash lea
acbe898c8b dolphinEmuMaster: use lib instead of stdenv.lib 2019-08-23 02:41:36 -07:00
ash lea
32f332fded dolphinEmu: use lib instead of stdenv.lib 2019-08-23 02:41:36 -07:00
ash lea
bd8f12024b dolphinEmuMaster: use wrapQtAppsHook 2019-08-23 02:41:36 -07:00
ash lea
4a7992d2b8 dolphinEmu: fix build 2019-08-23 02:41:36 -07:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
marius851000
f2068d3aa4 dolphinEmuMaster: update to the latest upstream version 2019-08-04 18:10:11 -07:00
Frederik Rietdijk
6f723b9bad Merge master into staging-next 2019-08-02 09:18:37 +02:00
K. Bruneau
7c4d08421e winetricks: 20190310 -> 20190615 (#64706) 2019-08-01 10:47:16 -04:00
Frederik Rietdijk
cb3ce5d26d Merge master into staging-next 2019-07-28 12:11:37 +02:00
Michael Raskin
11ed5eba74
Merge pull request #65368 from ikervagyok/wine412
wine-{unstable,staging}: 4.9 -> 4.12.1
2019-07-28 07:10:59 +00:00
Frederik Rietdijk
0f6bda38fe Merge staging-next into staging 2019-07-26 14:45:31 +02:00
Averell Dalton
9332773e51 wine: disable zbar in gst-plugins-bad 2019-07-23 16:30:56 +02:00
worldofpeace
b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
Lengyel Balazs
a031a1f4b8 wine: 4.9 -> 4.12.1 2019-07-21 20:47:52 +02:00
Lengyel Balazs
8a83fb70d0 wine-mono: 4.8.3 -> 4.9.0 2019-07-21 20:47:01 +02:00
Graham Christensen
3f4ed94173
Merge pull request #64731 from risicle/ris-dosbox-0.74-3
dosbox: 0.74-2 -> 0.74-3, fixing CVE-2019-7165, CVE-2019-12594
2019-07-18 17:35:51 -04:00
Frederik Rietdijk
a28a9ac156 Merge master into staging-next 2019-07-16 11:15:46 +02:00
Michael Raskin
4a68d3bb79
Merge pull request #63817 from ambrop72/wine-wrapper-fix
wine: Set WINELOADER in wrapper, wrap also wine64.
2019-07-15 10:40:15 +00:00
Robert Scott
428e215313 dosbox: 0.74-2 -> 0.74-3
fixes CVE-2019-7165, CVE-2019-12594
2019-07-14 12:39:15 +01:00
Thomas Tuegel
56d5963382
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps
Wrap Qt applications
2019-07-05 14:38:10 -05:00
Thomas Tuegel
51d78034a1
wrapQtAppsHook: Remove ad hoc Qt wrappers 2019-07-05 10:42:08 -05:00
Daiderd Jordan
956c197ee6
dolphin-emu: remove cf-private 2019-07-03 22:20:11 +02:00
worldofpeace
3f4a353737 treewide: use dontUnpack 2019-07-01 04:23:51 -04:00
Ambroz Bizjak
96c957f92c wine: Set WINELOADER in wrapper, wrap also wine64.
Fixes #63170. Note that this brings back wrapping of wine64 which was removed in #28486 because the underlying issue is now fixed.
2019-06-27 14:38:57 +02:00
Frederik Rietdijk
f120248daf Merge staging-next into staging 2019-06-18 11:07:56 +02:00
Michael Raskin
63379e8e86
Merge pull request #63044 from JohnAZoidberg/wine-fonts
winePackages.fonts: init at 4.0
2019-06-17 19:39:52 +00:00
Matthew Bauer
4d6f65b81f
Merge pull request #62167 from matthewbauer/alias-libgl
Add libGL* aliases
2019-06-17 15:18:29 -04:00
Matthew Bauer
263f5891b6 treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa
Just use mesa for these to be more clear. Move these to aliases.nix
2019-06-17 14:43:18 -04:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Alexander V. Nikolaev
2b4ac8d003 wine: 4.8 -> 4.9, 4.0 -> 4.0.1 2019-06-15 18:32:50 +02:00
Daniel Schaefer
3303bc1fd7 wine: Use proper license attribute 2019-06-12 23:36:10 +02:00
Daniel Schaefer
66fffe99d8 winePackages.fonts: init at 4.0
"Wine's fonts should be a natural candidate for their own subpackage"
https://wiki.winehq.org/Packaging

They are a replacement for some Microsoft fonts not available in other
replacement packages.
2019-06-12 23:33:18 +02:00
Matthew Bauer
290737edf0
Merge pull request #57103 from natemonster321/master
pcsx2: add -DXDG_STD build flag
2019-06-10 21:20:57 -04:00
Renaud
ec57ea39a6
Merge pull request #62477 from r-ryantm/auto-update/mgba
mgba: 0.7.1 -> 0.7.2
2019-06-10 15:55:11 +02:00
Vladimír Čunát
e596a33dc0
uae: fixup build
Fixes #62341.  I'm not sure why the problem happened,
but the solution seems fairly simple and risk-free.
2019-06-09 12:24:19 +02:00
Nikolay Amiantov
dff950155e rpcs3: 0.0.5-6980-81e5f3b7f -> 0.0.6-8187-790962425
Clean whitespaces.
2019-06-04 01:36:27 +03:00
Nikolay Amiantov
bb0fc95a89 citra: 2018-06-09 -> 2019-05-25 2019-06-04 01:36:27 +03:00