tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
bsnes-hd: unbreak on x86_64-darwin
Weijia Wang
3 years ago
76aaf902
0ad5b197
+17
-11
2 changed files
expand all
collapse all
unified
split
pkgs
applications
emulators
bsnes
bsnes-hd
default.nix
top-level
all-packages.nix
+16
-8
pkgs/applications/emulators/bsnes/bsnes-hd/default.nix
···
6
6
, SDL2
7
7
, gtk3, gtksourceview3
8
8
, alsa-lib, libao, openal, libpulseaudio
9
9
-
, libicns, Cocoa, OpenAL
9
9
+
, libicns, makeWrapper, darwin
10
10
}:
11
11
12
12
+
let
13
13
+
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa OpenAL;
14
14
+
in
12
15
stdenv.mkDerivation {
13
16
pname = "bsnes-hd";
14
17
version = "10.6-beta";
···
35
38
./macos-copy-app-to-prefix.patch
36
39
];
37
40
38
38
-
nativeBuildInputs = [ pkg-config wrapGAppsHook ]
39
39
-
++ lib.optionals stdenv.isDarwin [ libicns ];
41
41
+
nativeBuildInputs = [ pkg-config ]
42
42
+
++ lib.optionals stdenv.isLinux [ wrapGAppsHook ]
43
43
+
++ lib.optionals stdenv.isDarwin [ libicns makeWrapper ];
40
44
41
45
buildInputs = [ SDL2 libao ]
42
46
++ lib.optionals stdenv.isLinux [ libX11 libXv udev gtk3 gtksourceview3 alsa-lib openal libpulseaudio ]
···
44
48
45
49
enableParallelBuilding = true;
46
50
47
47
-
makeFlags = [ "-C" "bsnes" "hiro=gtk3" "prefix=$(out)" ];
51
51
+
makeFlags = [ "-C" "bsnes" "prefix=$(out)" ]
52
52
+
++ lib.optionals stdenv.isLinux [ "hiro=gtk3" ]
53
53
+
++ lib.optionals stdenv.isDarwin [ "hiro=cocoa" ];
54
54
+
55
55
+
postInstall = lib.optionalString stdenv.isDarwin ''
56
56
+
mkdir -p $out/bin
57
57
+
makeWrapper $out/{Applications/bsnes.app/Contents/MacOS,bin}/bsnes
58
58
+
'';
48
59
49
60
# https://github.com/bsnes-emu/bsnes/issues/107
50
50
-
preFixup = ''
61
61
+
preFixup = lib.optionalString stdenv.isLinux ''
51
62
gappsWrapperArgs+=(
52
63
--prefix GDK_BACKEND : x11
53
64
)
···
59
70
license = licenses.gpl3Only;
60
71
maintainers = with maintainers; [ stevebob ];
61
72
platforms = platforms.unix;
62
62
-
# ../nall/traits.hpp:19:14: error: no member named 'is_floating_point_v' in namespace 'std'; did you mean 'is_floating_point'?
63
63
-
# using std::is_floating_point_v;
64
64
-
broken = (stdenv.isDarwin && stdenv.isx86_64);
65
73
mainProgram = "bsnes";
66
74
};
67
75
}
+1
-3
pkgs/top-level/all-packages.nix
···
2175
2175
2176
2176
ares = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/ares { };
2177
2177
2178
2178
-
bsnes-hd = callPackage ../applications/emulators/bsnes/bsnes-hd {
2179
2179
-
inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL;
2180
2180
-
};
2178
2178
+
bsnes-hd = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/bsnes-hd { };
2181
2179
2182
2180
higan = callPackage ../applications/emulators/bsnes/higan { };
2183
2181