diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-05-12 14:45:39 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-05-12 14:56:01 +0000 |
| commit | eb7dadee9c0f903f1152f8dd4165453bfa48ccf4 (patch) | |
| tree | a6bd66dcbec895aae167465672af08a1ca70f089 /nixpkgs/pkgs/misc/emulators/snes9x-gtk | |
| parent | 3879b925f5dae3a0eb5c98b10c1ac5a0e4d729a3 (diff) | |
| parent | 683c68232e91f76386db979c461d8fbe2a018782 (diff) | |
| download | nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.gz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.bz2 nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.lz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.xz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.zst nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.zip | |
Merge commit '683c68232e91f76386db979c461d8fbe2a018782'
Diffstat (limited to 'nixpkgs/pkgs/misc/emulators/snes9x-gtk')
| -rw-r--r-- | nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix b/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix index 0ae92121cab1..6560024b19e0 100644 --- a/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,25 +1,22 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, wrapGAppsHook, intltool, pkgconfig -, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, portaudio }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { pname = "snes9x-gtk"; - version = "1.57"; + version = "1.60"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; rev = version; - sha256 = "1jcvj2l03b98iz6aq4x747vfz7i6h6j339z4brj4vz71s11vn31a"; + sha256 = "12hpn7zcdvp30ldpw2zf115yjqv55n1ldjbids7vx0lvbpr06dm1"; }; enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook wrapGAppsHook intltool pkgconfig ]; - buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip portaudio ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip pulseaudio portaudio ]; - preAutoreconf = '' - cd gtk - intltoolize - ''; + preConfigure = "cd gtk"; meta = with stdenv.lib; { homepage = "http://www.snes9x.com"; |