diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-24 06:29:09 +0000 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-24 06:29:09 +0000 |
| commit | bde20f3e881049c9d019eb34c07d6194b20b0042 (patch) | |
| tree | f24782e55ca68a214d0fe7585097d97a6aa687dd /pkgs/misc/emulators | |
| parent | 6a29a56c1277d80aa65e063f34a179c847e6d8b4 (diff) | |
| parent | 50d66b945ee5aceae2bbf2eb791487e18ac9d374 (diff) | |
| download | nixpkgs-bde20f3e881049c9d019eb34c07d6194b20b0042.tar nixpkgs-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.gz nixpkgs-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.bz2 nixpkgs-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.lz nixpkgs-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.xz nixpkgs-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.zst nixpkgs-bde20f3e881049c9d019eb34c07d6194b20b0042.zip | |
Merge branch 'master' into x-updates
Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.nix
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/hatari/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 4 |
2 files changed, 24 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix new file mode 100644 index 00000000000..e4eeff9cd54 --- /dev/null +++ b/pkgs/misc/emulators/hatari/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, zlib, SDL, cmake }: + +stdenv.mkDerivation rec { + name = "hatari-1.6.2"; + + src = fetchurl { + url = "http://download.tuxfamily.org/hatari/1.6.2/${name}.tar.bz2"; + sha256 = "0gqvfqqd0lg3hi261rwh6gi2b5kmza480kfzx43d4l49xcq09pi0"; + }; + + # For pthread_cancel + cmakeFlags = "-DCMAKE_EXE_LINKER_FLAGS=-lgcc_s"; + + buildInputs = [ zlib SDL cmake ]; + + meta = { + homepage = "http://hatari.tuxfamily.org/"; + description = "Hatari is an Atari ST/STE/TT/Falcon emulator."; + license = "GPLv2+"; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 3d75aef1735..32f6f2fc799 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; stdenv.mkDerivation rec { - version = "1.5.25"; + version = "1.5.28"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0812ryv1v0gqr13vmvjci09k89qhcr1qs0n052z4zw0vpipjd4rx"; + sha256 = "0ik02c11bp1glafcw82drkmjp8lxrkycvas3jlrvf1rv46blpy0b"; }; gecko = fetchurl { |