3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

82 commits

Author SHA1 Message Date
lasers 98d3299612 dolphinEmuMaster: 5.0-13178 -> 5.0-13603 2021-02-20 05:07:54 -06:00
TredwellGit 6464b64cb7 dolphinEmu: replace ffmpeg_3 with ffmpeg 2021-02-11 05:55:41 +00:00
ash lea fb76434e98 dolphinEmuMaster: 5.0-12716 -> 5.0-13178 2021-01-20 15:37:22 -08:00
Ben Siraphob fce00d15c2 pkgs/misc: pkgconfig -> pkg-config 2021-01-16 23:49:59 -08:00
Ben Siraphob 3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
r-burns 17da448013
dolphinEmu: install udev rules on linux (#105749)
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2020-12-03 09:26:21 +00:00
Konrad Borowski cff07fe0fd dolphinEmuMaster: 5.0-11824 -> 5.0-12716 2020-10-21 21:54:04 +02:00
Doron Behar 01d4e2fe33 treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07:00
Aaron Andersen 555bdfdd42
Merge pull request #84405 from ashkitten/update-dolphin
dolphinEmuMaster: 5.0-11608 -> 5.0-11824
2020-04-09 08:43:28 -04:00
ash lea 03f3d67e94 dolphinEmuMaster: 5.0-11608 -> 5.0-11824 2020-04-05 15:20:22 -07:00
Jan Tojnar 7c0a76d85e
dolphinEmuMaster: use Nix's libusb
We were passing libusb-compat instead of libusb1, and the former no longer propagates the latter, so Dolphin built its vendored libusb.
2020-04-04 09:07:07 +02:00
Jan Tojnar 99fbfef024
dolphinEmu: Fix build
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.

While at it, also move cmake to nativeBuildInputs.
2020-04-04 09:06:39 +02:00
Jan Tojnar a0739823bd
dolphinEmu: format with nixpkgs-fmt 2020-04-04 08:59:25 +02:00
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
Aaron Andersen 4ece8498dc dolphinEmu: fix broken build 2019-09-09 22:48:32 -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
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 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