diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2013-04-23 11:06:17 +0400 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-04-23 11:06:17 +0400 |
| commit | 031d1ee8c5aa7bb25c36c0dd70dfb6d1e2c9842c (patch) | |
| tree | 1bb7c3b2f55b5dd1504258f51b0cb89e24f6d944 | |
| parent | ad214d8d0c5f9988ff62d7e23fad894f0a69b4d1 (diff) | |
| parent | 7ca16e51151dab8d7a21c81b90f458d617f62d5b (diff) | |
| download | nixlib-031d1ee8c5aa7bb25c36c0dd70dfb6d1e2c9842c.tar nixlib-031d1ee8c5aa7bb25c36c0dd70dfb6d1e2c9842c.tar.gz nixlib-031d1ee8c5aa7bb25c36c0dd70dfb6d1e2c9842c.tar.bz2 nixlib-031d1ee8c5aa7bb25c36c0dd70dfb6d1e2c9842c.tar.lz nixlib-031d1ee8c5aa7bb25c36c0dd70dfb6d1e2c9842c.tar.xz nixlib-031d1ee8c5aa7bb25c36c0dd70dfb6d1e2c9842c.tar.zst nixlib-031d1ee8c5aa7bb25c36c0dd70dfb6d1e2c9842c.zip | |
Merge branch of 'hatari'
| -rw-r--r-- | pkgs/misc/emulators/hatari/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix new file mode 100644 index 000000000000..e4eeff9cd544 --- /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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 018d3a5a9057..8b431cd8cfd8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8976,6 +8976,8 @@ let gxemul = callPackage ../misc/gxemul { }; + hatari = callPackage ../misc/emulators/hatari { }; + hplip = callPackage ../misc/drivers/hplip { }; # using the new configuration style proposal which is unstable |