Commit Graph

61 Commits

Author SHA1 Message Date
ash lea
3dd336cd01 dolphinEmuMaster: 5.0-11109 -> 5.0-11608 2020-02-07 12:05:51 -08:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
ash lea
9f2d73ae48 dolphinEmuMaster: 5.0-10879 -> 5.0-11109 2019-11-06 22:27:42 -08: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
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
bd8f12024b dolphinEmuMaster: use wrapQtAppsHook 2019-08-23 02:41:36 -07: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
Daiderd Jordan
956c197ee6
dolphin-emu: remove cf-private 2019-07-03 22:20:11 +02:00
ash lea
1e8606946f dolphinEmuMaster: 2019-02-16 -> 5.0-9976
changed versioning scheme to match dolphin's own. this also allows us to
include the describe string without deriving it from the git repository
during build.
2019-04-17 17:35:40 -07:00
Cray Elliott
4cfb4ec5f4 dolphinEmuMaster: 2018-12-25 -> 2019-02-16 2019-02-21 01:27:28 -08:00
ash lea
ace58271af dolphinEmuMaster: 2018-09-24 -> 2018-12-25 (#52917) 2018-12-29 20:34:53 +01:00
Pierre Bourdon
259cf8812b dolphin-emu: fix metadata (GPLv2 -> GPLv2+, http -> https)
Dolphin has been GPLv2+ since 2015.
2018-10-15 03:28:17 +02:00
Okina Matara
55d43d4e02
dolphinEmuMaster: 2018-08-17 -> 2018-09-24 2018-09-25 09:26:57 -05:00
Daiderd Jordan
f6bc086b21
dolphinEmuMaster: mark broken on darwin
The default version isn't enabled on darwin either, however it did work
at some point.

    /tmp/nix-build-dolphin-emu-2018-08-17.drv-0/source/Source/Core/Core/NetPlayServer.cpp:1180:26: error: unknown type name 'lzo_uint32_t'; did you mean 'lzo_uint32'?
      std::vector<u8> wrkmem(LZO1X_1_MEM_COMPRESS);

/cc ZHF #45961
2018-09-20 22:17:57 +02:00
Okina Matara
6cf43791e7 dolphinEmuMaster: 2018-07-22 -> 2018-08-17 2018-08-18 12:38:13 -05:00
Okina Matara
21e5d59f9c dolphinEmuMaster: 2018-07-02 -> 2018-07-22 2018-07-30 09:42:53 -07:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Okina Matara
8b312db421 dolphinEmuMaster: 2018-06-22 -> 2018-07-02
also migrate from wxwidgets to qt, wxwidgets support in dolphin has been
dropped
2018-07-02 09:29:43 -07:00
Okina Matara
794c91b49e dolphinEmuMaster: 20180618 -> 2018-06-22 2018-06-23 01:48:52 -07:00
Okina Matara
25d4708c95 dolphinEmuMaster: Add option-dependent desktop file 2018-06-23 01:48:52 -07:00
Okina Matara
e4a32f980b dolphinEmuMaster: 20180609 -> 20180618 2018-06-23 01:48:52 -07:00
Okina Matara
45af94bfb9 dolphinEmuMaster: Enable Vulkan Dolphin did not have access to the Vulkan libs before, now it does. 2018-06-10 16:24:28 -07:00
Okina Matara
03ca9eeaa2 dolphinEmuMaster: 20180430 -> 20180609 2018-06-10 16:24:28 -07:00
Cray Elliott
800c46b24b dolphinEmuMaster: 20171218 -> 20180430
also fix build
2018-04-30 23:46:14 -07:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Luke Adams
5379bb4def dolphinEmuMaster: 20170902 -> 20171218 2017-12-23 22:31:15 -08:00
Luke Adams
18a1943ad8 dolphinEmuMaster: enable Darwin building (x64 only) 2017-12-23 22:31:15 -08:00
Luke Adams
51e53e0a71 dolphinEmuMaster: Add options to build gui with wx or qt 2017-12-23 22:31:15 -08:00
Luke Adams
a44253ec65 dolphinEmuMaster: allow Dolphin to use nix-provided deps 2017-12-23 22:31:15 -08:00
Luke Adams
6d63847041 dolphinEmuMaster: Create darwin outpath 2017-12-23 22:31:15 -08:00
Luke Adams
1852176d2e dolphinEmuMaster: move inputs to nativeBuildInputs
- add Darwin inputs
- Add curl to prevent in-tree build
- add libpng hidapi wxgtk for dolphin to use
2017-12-23 22:31:15 -08:00
Luke Adams
1e5973850e dolphinEmuMaster: convert cmakeFlags to list 2017-12-23 22:31:15 -08:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Cray Elliott
6a1be3d4f4 dolphinEmuMaster: 20170730 -> 20170902
many bugfixes and features implemented, included accurate NAND support
and ubershaders v2
2017-09-02 03:57:10 -07:00
Cray Elliott
2a8c1a942e dolphinEmuMaster: 20170705 -> 20170730
generally I only update this once a month or less, but the much awaited
ubershader branch landed
2017-07-31 11:59:46 -07:00
Cray Elliott
b963ba1bee dolphinEmuMaster: 20150802 -> 20170705
removed a substitution that is no longer needed, add new
dependencies, and use fetchFromGitHub instead of fetchgit
2017-07-08 14:24:42 -07:00
Vladimír Čunát
9fe56e52dd
dolphinEmu*: fixup build with glibc-2.25 2017-02-21 19:03:36 +01:00
Aneesh Agrawal
fcee1d0b28
Remove redundant -DCMAKE_BUILD_TYPE=Release flags
Since commit 183d05a0 in 2012, this is the default.

fixes #18000
2016-10-01 16:13:41 +02:00
Eelco Dolstra
05bdc0c89f Remove unnecessary references to gcc5
These cause an unnecessary rebuild of gcc.
2016-07-11 10:46:34 +02:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Tuomas Tynkkynen
d1937cf11a treewide: Make explicit that 'dev' output of gtk2 is used 2016-05-19 10:00:38 +02:00
Nikolay Amiantov
755e4633c7 mass-replace glib and gtk lib/*/include paths 2016-04-14 04:13:54 +03:00
Cray Elliott
84dc71ebe4 bump dolphinEmuMaster, remove no longer needed SDL dep
also add libevdev as a dep, read about all the changes at
https://dolphin-emu.org/blog/2015/08/01/dolphin-progress-report-july-2015/
2015-08-02 03:17:03 -07:00
Cray Elliott
e7c2a58250 bump dolphinEmuMaster, now needs gcc5 to compile
also removed wxGTK30 as that was unnecessary, and actually causes compilation errors with gcc5 in the mix
2015-06-09 03:24:18 -07:00
William A. Kennington III
b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
Cray Elliott
56de3acd5a dolphinEmuMaster: add libusb to depends, bump git version
this allows dolphin-emu to detect and use the Nintendo Wii U Gamecube Adapter
2015-04-21 20:40:32 -07:00
Cray Elliott
ae413373ca monthly bump of dolphinEmuMaster
see dolphin's progress report if you want to know what is new!
https://dolphin-emu.org/blog/2015/04/01/dolphin-progress-report-march-2015/
2015-04-04 11:00:47 -07:00