Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 775b1f6daa2b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d57d9ba288eb
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 10, 2019

  1. dolphinEmu: fix broken build

    (cherry picked from commit 4ece849)
    aanderse authored and worldofpeace committed Sep 10, 2019
    Copy the full SHA
    d57d9ba View commit details
Showing with 6 additions and 0 deletions.
  1. +6 −0 pkgs/misc/emulators/dolphin-emu/default.nix
6 changes: 6 additions & 0 deletions pkgs/misc/emulators/dolphin-emu/default.nix
Original file line number Diff line number Diff line change
@@ -22,6 +22,12 @@ stdenv.mkDerivation rec {
name = "dolphin-emu-5.0-soundtouch-exception-fix.patch";
sha256 = "0yd3l46nja5qiknnl30ryad98f3v8911jwnr67hn61dzx2kwbbaw";
})
# Fix build with gcc 8
(fetchpatch {
url = "https://salsa.debian.org/games-team/dolphin-emu/raw/9b7b4aeac1b60dcf28bdcafbed6bc498b2aeb0ad/debian/patches/03_gcc8.patch";
name = "03_gcc8.patch";
sha256 = "1da95gb8c95kd5cjhdvg19cv2z863lj3va5gx3bqc7g8r36glqxr";
})
];

postPatch = ''