diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-01-08 14:06:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-08 14:06:10 +0000 |
| commit | 592d8680adebce01acb8e4b7e9568f374c34ac3a (patch) | |
| tree | 3b189290cda42794d8c6ffc4addcdcb208a8fd72 | |
| parent | 3911ced090b963d67525e45e80261477948e3809 (diff) | |
| parent | c05b9ccd825861c1d8e31e71f926f9d8dc72f6f5 (diff) | |
Merge pull request #209599 from thiagokokada/retroarch-add-qt-backend
retroarch: add qtbase/spirv-tools as deps
| -rw-r--r-- | pkgs/applications/emulators/retroarch/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 5c18d47daa8a..7befac996fed 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -33,12 +33,15 @@ , nvidia_cg_toolkit , pkg-config , python3 +, qtbase , retroarch-assets , SDL2 +, spirv-tools , substituteAll , udev , vulkan-loader , wayland +, wrapQtAppsHook , zlib }: @@ -71,7 +74,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config ] ++ + nativeBuildInputs = [ pkg-config wrapQtAppsHook ] ++ lib.optional withWayland wayland ++ lib.optional (runtimeLibs != [ ]) makeWrapper; @@ -84,7 +87,9 @@ stdenv.mkDerivation rec { libxml2 mbedtls_2 python3 + qtbase SDL2 + spirv-tools zlib ] ++ lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 957705e129e0..4daff7e511a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2186,7 +2186,7 @@ with pkgs; ### APPLICATIONS/EMULATORS/RETROARCH - retroarchBare = callPackage ../applications/emulators/retroarch { }; + retroarchBare = qt5.callPackage ../applications/emulators/retroarch { }; retroarchFull = retroarch.override { cores = builtins.filter |