Merge pull request #75413 from aanderse/pcsx2

pcsx2: 1.4.0 -> unstable-2020-01-05
This commit is contained in:
Aaron Andersen
2020-01-11 10:42:06 -05:00
committed by GitHub
2 changed files with 46 additions and 36 deletions
+3 -1
View File
@@ -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 { };