diff options
Diffstat (limited to 'nixpkgs/pkgs/misc/emulators')
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix | 9 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/dosbox/default.nix | 8 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/vbam/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/wine/sources.nix | 10 |
4 files changed, 20 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix index e57c3854926f..d44560b4ddf4 100644 --- a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix @@ -20,13 +20,13 @@ let }; in stdenv.mkDerivation rec { name = "dolphin-emu-${version}"; - version = "2019-02-16"; + version = "5.0-9976"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "286aafd4ed2949f0b93230fee969c6a32fe75f07"; - sha256 = "0l0cpq8s7wnng7mhbnzf4v84zggqsqdykrzfyz5avvbv9pla7jwp"; + rev = "63f30cc44da248b0226e1c8724b3e53ecf4c768f"; + sha256 = "0lkf571kzmw26fybl1lqpvhc81jkbh4hcvi3766bb7mvvzapkybd"; }; enableParallelBuilding = true; @@ -47,6 +47,9 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SHARED_ENET=ON" "-DENABLE_LTO=ON" + "-DDOLPHIN_WC_REVISION=${src.rev}" + "-DDOLPHIN_WC_DESCRIBE=${version}" + "-DDOLPHIN_WC_BRANCH=master" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ]; diff --git a/nixpkgs/pkgs/misc/emulators/dosbox/default.nix b/nixpkgs/pkgs/misc/emulators/dosbox/default.nix index 878e98fa1665..fb63554871a2 100644 --- a/nixpkgs/pkgs/misc/emulators/dosbox/default.nix +++ b/nixpkgs/pkgs/misc/emulators/dosbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng }: +{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng, graphicsmagick }: stdenv.mkDerivation rec { name = "dosbox-0.74-2"; @@ -12,11 +12,14 @@ stdenv.mkDerivation rec { buildInputs = [ SDL SDL_net SDL_sound libGLU_combined libpng ]; + nativeBuildInputs = [ graphicsmagick ]; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; desktopItem = makeDesktopItem { name = "dosbox"; exec = "dosbox"; + icon = "dosbox"; comment = "x86 emulator with internal DOS"; desktopName = "DOSBox"; genericName = "DOS emulator"; @@ -26,6 +29,9 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications + + mkdir -p $out/share/icons/hicolor/256x256/apps + gm convert src/dosbox.ico $out/share/icons/hicolor/256x256/apps/dosbox.png ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/misc/emulators/vbam/default.nix b/nixpkgs/pkgs/misc/emulators/vbam/default.nix index 66e17fd3a7a3..72eb537bf184 100644 --- a/nixpkgs/pkgs/misc/emulators/vbam/default.nix +++ b/nixpkgs/pkgs/misc/emulators/vbam/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { name = "visualboyadvance-m-${version}"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; rev = "v${version}"; - sha256 = "03cs7wn01flx925sxhpz1j5sxa6s7wfxq71955kasn7a3xr1kxwn"; + sha256 = "0bgb9r6qc4g1biymayknj1fccwrdmn772i4qnc9zs3f9jrs0b34g"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/nixpkgs/pkgs/misc/emulators/wine/sources.nix index cfb4e35c2b55..70fadf7683f1 100644 --- a/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -31,24 +31,24 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.8.0"; + version = "4.8.2"; url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; - sha256 = "0y47mfjkb2viraqrvi8qpjn2935sra81h3l4bvaag737s7zmj0c9"; + sha256 = "1hvwhqdb11j9yzhhw86fjhj9bawg76zrh0wnx658pn5xghhk2jhy"; }; }; unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "4.5"; + version = "4.6"; url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz"; - sha256 = "1dy1v27cw9vp2xnr8y4bdcvvw5ivcgpk2375jgn536csbwaxgwjz"; + sha256 = "1nk2nlkdklwpd0kbq8hx59gl05b5wglcla0v3892by6k4kwh341j"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "18xpha7nl3jg7c24cgbncciyyqqb6svsyfp1xk81993wnl6r8abs"; + sha256 = "0mripibsi1p8h2j9ngqszkcjppdxji027ss4shqwb0nypaydd9w2"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; |