diff options
author | Martino Fontana <tinozzo123@tutanota.com> | 2022-04-21 11:03:07 +0200 |
---|---|---|
committer | Martino Fontana <tinozzo123@tutanota.com> | 2022-04-21 15:04:14 +0200 |
commit | 3f8ac21fda22b1a832d4ba331e6c511407fb7d68 (patch) | |
tree | f28f880156ec0af7bd0d71e708491da438f4806b | |
parent | b06d35b406c2396dd1611dc8601138fa3d06ee60 (diff) | |
download | nixpkgs-3f8ac21fda22b1a832d4ba331e6c511407fb7d68.tar nixpkgs-3f8ac21fda22b1a832d4ba331e6c511407fb7d68.tar.gz nixpkgs-3f8ac21fda22b1a832d4ba331e6c511407fb7d68.tar.bz2 nixpkgs-3f8ac21fda22b1a832d4ba331e6c511407fb7d68.tar.lz nixpkgs-3f8ac21fda22b1a832d4ba331e6c511407fb7d68.tar.xz nixpkgs-3f8ac21fda22b1a832d4ba331e6c511407fb7d68.tar.zst nixpkgs-3f8ac21fda22b1a832d4ba331e6c511407fb7d68.zip |
dolphin-emu-{beta,primehack}: fix build
-rw-r--r-- | pkgs/applications/emulators/dolphin-emu/master.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/emulators/dolphin-emu/primehack.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index be3e7f555f8..8780975a84a 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake , wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext -, libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama +, libXrandr, libusb1, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsa-lib -, miniupnpc, enet, mbedtls, soundtouch, sfml, writeScript +, miniupnpc, enet, mbedtls, soundtouch, sfml, xz, writeScript , vulkan-loader ? null, libpulseaudio ? null # - Inputs used for Darwin @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { buildInputs = [ curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio - libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo - portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml + libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp + portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml xz qtbase ] ++ lib.optionals stdenv.isLinux [ bluez udev libevdev alsa-lib vulkan-loader diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index 90510d64522..fdfc6d44eca 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -14,7 +14,6 @@ , gettext , libXrandr , libusb1 -, lzo , libpthreadstubs , libXext , libXxf86vm @@ -34,6 +33,7 @@ , soundtouch , sfml , fmt +, xz , vulkan-loader , libpulseaudio @@ -81,7 +81,6 @@ stdenv.mkDerivation rec { readline openal libXdmcp - lzo portaudio libusb1 libpng @@ -92,6 +91,7 @@ stdenv.mkDerivation rec { soundtouch sfml fmt + xz qtbase ] ++ lib.optionals stdenv.isLinux [ bluez |