summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2020-01-11 10:42:06 -0500
committerGitHub <noreply@github.com>2020-01-11 10:42:06 -0500
commitfabd3f506cc5d840cea41294a3ecb44ee03b9e1c (patch)
tree5c56df4d30fbc76a78c7aac5e8950c8c416e35bd /pkgs/top-level/all-packages.nix
parent33ebfc6cc34ce3674c989cd61e0eddb1b0af536a (diff)
parentd30de7887a03233c09dcadfb21823e31364bba79 (diff)
downloadnixpkgs-fabd3f506cc5d840cea41294a3ecb44ee03b9e1c.tar
nixpkgs-fabd3f506cc5d840cea41294a3ecb44ee03b9e1c.tar.gz
nixpkgs-fabd3f506cc5d840cea41294a3ecb44ee03b9e1c.tar.bz2
nixpkgs-fabd3f506cc5d840cea41294a3ecb44ee03b9e1c.tar.lz
nixpkgs-fabd3f506cc5d840cea41294a3ecb44ee03b9e1c.tar.xz
nixpkgs-fabd3f506cc5d840cea41294a3ecb44ee03b9e1c.tar.zst
nixpkgs-fabd3f506cc5d840cea41294a3ecb44ee03b9e1c.zip
Merge pull request #75413 from aanderse/pcsx2
pcsx2: 1.4.0 -> unstable-2020-01-05
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c15a4198f62..afa0f760c05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20704,7 +20704,9 @@ in
     ffmpeg = ffmpeg_2;
   };
 
-  pcsx2 = pkgsi686Linux.callPackage ../misc/emulators/pcsx2 { };
+  pcsx2 = pkgsi686Linux.callPackage ../misc/emulators/pcsx2 {
+    wxGTK = pkgsi686Linux.wxGTK30;
+  };
 
   pekwm = callPackage ../applications/window-managers/pekwm { };