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: 4c23f686990b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8e3c712e24f6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 31, 2020

  1. retroarch/cores.nix: use correct platform for darwin 

    This should fix the regression found in
https://hydra.nixos.org/eval/1577308#tabs-now-fail. The libretro
scripts use “osx” as the identifier for macOS, and “unix” seems to
mean linux.

If anyone could help out by confirming this works. I don’t currently
have access to a macOS machine.
    @matthewbauer
    matthewbauer committed Mar 31, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eb84499 View commit details

Commits on Apr 1, 2020

  1. Merge pull request #83891 from matthewbauer/retroarch-fix-macos 

    retroarch/cores.nix: use correct platform for darwin
    @matthewbauer
    matthewbauer authored Apr 1, 2020
    Copy the full SHA
    8e3c712 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/misc/emulators/retroarch/cores.nix
2 changes: 1 addition & 1 deletion pkgs/misc/emulators/retroarch/cores.nix
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ let
makeFlags = [
"platform=${{
linux = "unix";
darwin = "unix";
darwin = "osx";
windows = "win";
}.${stdenv.hostPlatform.parsed.kernel.name} or stdenv.hostPlatform.parsed.kernel.name}"
"ARCH=${{