Commit Graph

437 Commits

Author SHA1 Message Date
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Thomas Tuegel
8df4cbe20f mgba: use Qt 5.4 2015-09-19 10:01:25 -05:00
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
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +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
AndersonTorres
65e44c62de Desmume: init at 0.9.11 2015-09-12 23:58:23 -03:00
Rok Garbas
747e0149cc marking junit and dolphinEmu as broken 2015-09-08 14:05:40 +02:00
Cillian de Róiste
75f880b1d1 mednafen: fix src url (sourceforge -> mednafen.fobby.net)
Also bump the minor version 0.9.38.5 -> 0.9.38.6
2015-08-31 13:50:14 +02: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
Nikolay Amiantov
6d6eb1913a Merge pull request #9025 from abbradar/zsnes
zsnes: use Debian patches, fix segfault on saving state
2015-08-21 23:53:44 +03:00
Cray Elliott
e99167d7f1 new package: mgba 0.3.0
This is a new Gameboy Advance emulator which aims to run on lower
end hardware without sacrificing accuracy or portability.
2015-08-17 18:00:33 -07: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
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
Mateusz Kowalczyk
7930150366 Merge pull request #9045 from AndersonTorres/PPSSPP
PPSSPP: 0.9.9.1 -> 1.1.0
2015-07-31 09:43:49 +01:00
AndersonTorres
752bbdbfbc PPSSPP: 0.9.9.1 -> 1.1.0
Changing SDL to version 2.
2015-07-30 13:18:52 -03: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
Nikolay Amiantov
30facde98c zsnes: use Debian patches, fix segfault on saving state 2015-07-28 12:53:57 +03:00
Arseniy Seroka
99ac72994c Merge pull request #8984 from AndersonTorres/stella
Stella: 4.6 -> 4.6.1
2015-07-26 20:07:25 +03:00
AndersonTorres
6ccd69872a Stella: 4.6 -> 4.6.1 2015-07-25 10:49:53 -03:00
AndersonTorres
517451df97 FS-UAE: 2.4.1 -> 2.4.3 2015-07-15 09:35:58 -03:00
AndersonTorres
0b9f605a2d Mednafen: Updates
Mednafen: 0.9.36.4 -> 0.9.38.5
Server: 0.5.1 -> 0.5.2
2015-07-15 08:11:23 -03: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
7297255019 Convert all jack references to libjack2 2015-06-27 00:17:52 -07:00
lassulus
4ed0a4eaf8 add pkg: vbam, closes #8339 2015-06-18 11:35:43 +02: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
be5f4082fd pulseaudio: Remove default derivation 2015-05-29 14:47:33 -07:00
William A. Kennington III
b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
Tobias Geerinckx-Rice
d01927269e uae: use archive.org links
The original homepage is long gone (as is the tarball it hosted).
2015-05-20 16:42:12 +02:00
Luca Bruno
9adde87fea More usage of gnome3.defaultIconTheme 2015-05-19 14:44:27 +02: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
Arseniy Seroka
87b4f9286d Merge pull request #7604 from bendlas/wine64
wine: add 64 bit build and module
2015-05-10 19:13:37 +03:00
Arseniy Seroka
f6016b9a7b Merge pull request #7784 from seppeljordan/emulationstation
Update emulationstation 2.0.0.rc1 -> 2.0.1a
2015-05-10 19:07:46 +03: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
Sebastian Jordan
72d3d6fbfc Update emulationstation 2.0.0.rc1 -> 2.0.1a 2015-05-10 01:49:09 +02:00
Joachim Fasting
bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Pascal Wittmann
f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Pascal Wittmann
2f15fcc4c9 Merge pull request #7389 from AndersonTorres/atari++
Atari++: 1.46 -> 1.73
2015-04-26 10:05:14 +02:00
Nikolay Amiantov
f6607ca4a5 wineStaging: add derivation 2015-04-23 21:00:42 +03: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
AndersonTorres
28f5eccd8d Atari800: no more ROM install
Now, the expression will not install ROM files anymore. It is easier the
final user install them locally by himself, in a local directory.
Also, it appears that there is a missing ROM in the package provided by
the project's site.
2015-04-17 21:39:25 -03:00
AndersonTorres
10dbc6cf3a Atari++: 1.46 -> 1.73
And a complete reformulation of build expression.
2015-04-14 22:44:57 -03:00
AndersonTorres
eae83dc472 Atari800: 2.2.1 -> 3.1.0 2015-04-13 05:35:43 -03:00
Arseniy Seroka
0d3be79490 Merge pull request #7323 from AndersonTorres/gxemul
Gxemul: 0.4.6 -> 0.6.0.1
2015-04-12 04:22:16 +03:00
AndersonTorres
9ebba5fe0c Gxemul: 0.4.6 -> 0.6.0.1 2015-04-11 16:00:55 -03:00
AndersonTorres
5a91f9a34d Stella: 4.2 -> 4.6 2015-04-06 12:14:29 +02:00
AndersonTorres
5ff233be6b Higan: minor update
Updating source url
2015-04-06 11:51:33 +02:00
Michael Raskin
99b5486db6 Update Wine 2015-04-05 20:27:25 +03: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
Edward Tjörnhammar
1345a65765 Remove XBMC expressions in favor of the Kodi ones 2015-03-30 21:43:32 +02: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
Vladimír Čunát
2069156d5c nestopia: disable failing parallel builds
http://hydra.nixos.org/build/19861758
2015-03-07 14:34:28 +01:00
Cray Elliott
2ee6e81896 Monthly bump of dolphinEmuMaster
Large performance improvements, smaller binary, and higher accuracy!
See for details :
https://dolphin-emu.org/blog/2015/03/01/dolphin-progress-report-february-2015/
2015-03-02 01:48:05 -08:00
Nikolay Amiantov
ca8137d4a8 winetricks: update 2015-02-19 02:12:09 +03:00
Herwig Hochleitner
dea3ac7783 Use XDG_ICON_DIRS in cdemu's XDG_DATA_DIRS 2015-02-10 14:44:29 +01:00
Herwig Hochleitner
7d24bcdbcf Add gdk_pixbuf, gnome_icon_theme and librsvg to cdemu gui programs 2015-02-10 14:25:23 +01:00
Herwig Hochleitner
eb03122cf6 Use gnome3 icon theme in cdemu 2015-02-10 14:09:27 +01:00
Herwig Hochleitner
67f9c8b025 Fix cdemu ui gsettings schema paths 2015-02-10 13:14:25 +01:00
Herwig Hochleitner
b909def3e1 Whitespace cleanup 2015-02-10 11:49:32 +01:00
Herwig Hochleitner
2961b83d08 Add cdemu packages and module 2015-02-10 06:49:47 +01: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
Cray Elliott
221a6f67a5 monthly bump of dolphinEmuMaster
check out what's new at https://dolphin-emu.org/blog/2015/02/01/dolphin-progress-report-january-2015/
2015-02-01 03:59:44 -08:00
Edward Tjörnhammar
3a321906d1 Add Kodi retroarch launchers 2015-01-19 22:14:37 +01: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
Sander van der Burg
af9bb71848 Merge pull request #5592 from AndersonTorres/fsuae
FS-UAE (version 2.4.1): New Package
2015-01-06 09:59:56 +00:00
AndersonTorres
291d507d98 FS-UAE (version 2.4.1): New Package
FS-UAE is a new, cycle-accurate, customizable Amiga Emulator.
2015-01-05 17:47:07 -02:00
Cray Elliott
5a92c9f0a1 remove extraneous platform from dolphinEmuMaster 2015-01-03 23:00:29 -08:00
Cray Elliott
c9d963c4e6 time for the monthly dolphinEmuMaster bump 2015-01-03 19:44:34 -08:00
Tobias Geerinckx-Rice
c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01: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
Cray Elliott
183f0b9d9a update retroarch and all of the libretro cores 2014-12-25 02:04:08 -08:00
Cray Elliott
d54db47b3c add new emulator, nestopia undead 2014-12-23 02:33:00 -08:00
Michael Raskin
1317dd7e62 Wine: 1.7.30 → 1.7.33 2014-12-21 11:14:25 +03:00
Vladimír Čunát
e815624b67 dolphin-emu-master: disable unsupported i686 platform 2014-12-10 15:43:15 +01:00
Cray Elliott
682ea7c775 monthly bump of dolphinEmuMaster
Tons of accuracy improvements per usual, some somewhat interesting ones:
- Constant Angular Velocity for Disk Reads
- FIFO buffer fix
- Vectorized Vertex loading
and more! read about it at dolphin-emu.org
2014-12-02 01:06:15 -08:00
Cray Elliott
825e99808c add a platform to all of my packages 2014-11-19 03:03:00 -08:00
AndersonTorres
a86ba451bf Stella: update to 4.2 2014-11-18 11:12:47 -02:00
AndersonTorres
f9c2d0a7a3 Stella: update to 4.1.1 2014-11-18 11:12:47 -02:00
Cray Elliott
026d004a36 dolphinEmuMaster bump to bring in new HLE Audio code
Generally we only bump once per month, but due to the new
dolphin-emu.org blog post covering the subject, I couldn't
resist :)

if you'd like to read more about it, read here!
https://dolphin-emu.org/blog/2014/11/12/the-rise-of-hle-audio/#cuthere
2014-11-12 17:54:02 -08:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Cray Elliott
7244de4a4a add myself to libretro maintainers 2014-11-10 02:24:19 -08:00
Cray Elliott
9e3137ddf0 montly bump of retroarch and libretro cores 2014-11-09 23:18:23 -08:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Rickard Nilsson
f1d7aad20b stella-libretro: Bump revision 2014-11-04 18:27:40 +01:00
Michael Raskin
9c458ad8d4 Update Wine-unstable 2014-11-02 23:51:58 +03:00
Cray Elliott
545f8e8c6c monthly bump of dolphinEmuMaster
also dolphinEmu and dolphinEmuMaster had an extraneous stdenv removed
from buildInputs
2014-11-02 00:11:01 -07:00
Cray Elliott
72d7324af5 Add mednafen TurboGrafx-16 libretro core 2014-10-28 02:08:43 -07:00
Michael Raskin
5199b46964 Update Wine unstable 2014-10-18 19:52:59 +04:00
Cray Elliott
e39bf7a704 Replaced retroarchBare with retroarchBareMaster, also added a few new libretro cores
retroarchBare was too old for any practical use at this point, so it was removed in favor
of fetching releases from git. RetroArch often recommends checkout out the latest git master
if you are on a desktop platform, so we are conforming with their recommendation. I plan on
bumping the git of retroarch and each core every month, and I plan on adding more libretro
cores in the future.

The libretro cores that were added are nestopia, quicknes, snes9x, and vba-m

planned next are : bsnes-accuracy, bsnes-balanced, bsnes-performance, a few libretro mame ports

Closes #4448
2014-10-16 12:53:39 +01:00
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Michael Raskin
a451c62650 Update Wine unstable 2014-10-06 02:43:58 +04:00
Cray Elliott
817ebe24ab Update dolphinEmuMaster
The plan at this point is to update dolphinEmuMaster every month in
tanden with the latest development report on the dolphin-emu.org blog.

Closes #4374
2014-10-03 20:30:28 +01:00
Rickard Nilsson
1ccb2f76b5 Merge pull request #4078 from edwtjo/libretro-cores-addendum
XBMC RetroArch integration and some cores
2014-10-02 20:50:49 +02:00
Edward Tjörnhammar
9d93f9bcda XBMC AdvancedLauncher RetroArch launchers.
These are wrappers for retroarch wrappers, they are needed since launching a
process from XBMC(as a display manager and probably otherwise), using
AdvancedLauncher, results in it and it's parent recieving the same gamepad
input.

These wrappers will produce no sound on XBMC and AdvancedLauncher setups not
using a sound daemon, since XBMC gets paused while still holding onto the sound
device.
2014-10-02 20:09:18 +02:00
AndersonTorres
1c0d37a038 Higan: adding config.higan.{guiToolkit,profile} options
Now we can parametrize Higan locally.
By default, guiToolkit = "gtk" and profile = "performance" (the accuracy
profile is seriously slow on my machine :) )

Closes #4340
2014-10-01 02:17:40 +01:00
AndersonTorres
efdc89de60 Mednafen: update to 0.9.36.4
Closes #4304
2014-09-28 22:48:20 +01:00
Edward Tjörnhammar
655ae33816 libretro.ppsspp: Fixes building on i686 2014-09-26 18:35:46 +02: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
Edward Tjörnhammar
383f142858 libretro: added bsnes, fba, gambatte, genesis-plus-gx, prboom 2014-09-22 12:35:07 +02:00
Mateusz Kowalczyk
85eec74433 hatari: update from 1.6.2 to 1.8.0 2014-09-21 18:37:58 +01:00
AndersonTorres
4f85f64153 Higan: adding "profile" and "gui" building options
Also, removing builder.sh and copying everything to Nix expression.

Closes #4048
2014-09-20 23:51:15 +01:00
AndersonTorres
b39e5ce957 Small style fixups
In this commit, I modified some files, conforming them to a
idiosyncratic standard - mainly, a template for meta attribs.
2014-09-10 21:34:50 -03:00
Edward Tjörnhammar
6fcab9baca libretro-cores:
- adding: 4do, desmume, fceumm, mame, mupen64plus, scummvm,
            snes9x, stella, picodrive, ppsspp and vba

retroarch:
  - added retroarch wrapper for configured cores
  - changed attributes, old retroarch is now retroarchBare*
2014-09-04 20:03:13 +02:00
Michael Raskin
3f1ce8d864 Merge pull request #3886 from AndersonTorres/higan
Higan - a quick&dirty workaround
2014-09-03 21:49:05 +04:00
Michael Raskin
4c41c1ffbf Merge pull request #3890 from edwtjo/emulationstation-2.0.0-rc1
emulationstation: 1.0.2 -> 2.0.0-rc1
2014-09-03 21:47:58 +04:00
Michael Raskin
9cf910cd51 Merge pull request #3932 from MP2E/retroarch_git_master
add retroarchMaster package
2014-09-03 18:59:13 +04:00
Peter Simons
b8260f5435 dolphin-emu: drop reference to git from buildInputs since it's no longer an argument to the expression after #3936 2014-09-02 11:57:34 +02:00
Cray Elliott
cc7fa316a4 dolphinEmu doesn't need the git package 2014-09-02 02:07:22 -07:00
Cray Elliott
73439c6053 add dolphinEmu and dolphinEmuMaster
Dolphin is a high quality, open source Gamecube/Wii/Triforce emulator for
Windows, Mac OS X and Linux
2014-09-02 01:20:38 -07:00
Cray Elliott
b56a348af7 add retroarchMaster package 2014-09-02 00:56:47 -07:00
Michael Raskin
82ed86dd76 Remove unneeded definitions 2014-09-02 01:03:39 +04:00
AndersonTorres
44d772d1e0 Stella 4.0: New Package
Stella is an Atari 2600 VCS emulator
2014-08-31 14:31:09 -03:00
Michael Raskin
3bbf64b6d0 Update unstable Wine 2014-08-31 18:20:06 +04:00
AndersonTorres
f5f4bf1a25 Higan: Updating builder.sh script
Now builder.sh will install a higan-config.sh script
to write auxiliary stuff on $HOME/.config/higan directory.
That way, higan searches locally and runs cleanly.

Obviously it's a hack, but the only other way is to do a huge patch on
upstream sources; personally I think it is better to work that type of
thing directly on higan sources.
2014-08-31 09:47:49 -03:00
Edward Tjörnhammar
a5a92fdd53 emulationstation: 1.0.2 -> 2.0.0-rc1 2014-08-31 12:50:35 +02:00
AndersonTorres
0847250505 Higan - a quick&dirty workaround
Higan uses a lot of hardcoded paths when it looks for runtime files
as shaders, icons and mainly BIOS files. So, we made a q&d wrapper
script: it copies all these files to $HOME/.config/higan in the 1st
invocation.
2014-08-30 23:59:49 -03:00
AndersonTorres
4cb061111c Higan - new package (alpha stage!)
Higan is a cycle-accurate Nintendo multi-system emulator
It is a preliminary release for Nix - I need to investigate
some issues about install process and hardcoded paths...
2014-08-29 18:32:07 +01:00
Mateusz Kowalczyk
10e3cf6f5a ppsspp: update to 0.9.9.1 2014-08-25 10:14:44 +02:00
Edward Tjörnhammar
a79241aa15 add: emulationstation 1.0.2 2014-08-23 15:33:22 +02:00
AndersonTorres
a21a987c63 Mednafen: update to 0.9.36.3 2014-08-14 11:20:25 -03:00
Mateusz Kowalczyk
27f8a89dfa ppsspp: update to 0.9.9 2014-08-09 02:49:50 +02:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02: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
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Joachim Schiele
d46c61b863 Merge pull request #3321 from qknight/snes9x-gtk
added snes9x-gtk with pulseaudio support
2014-07-27 21:38:25 +02:00
Joachim Schiele
de1ae606db snes9x-gtk: added changes requested by offlinehacker 2014-07-27 21:37:52 +02:00
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Joachim Schiele
743e3df3b8 made changes requested by pSub 2014-07-23 14:03:48 +02:00
Joachim Schiele
9d8a804047 added snes9x-gtk with pulseaudio support 2014-07-20 10:39:42 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00