diff options
| author | OPNA2608 <christoph.neidahl@gmail.com> | 2022-02-22 21:18:17 +0100 |
|---|---|---|
| committer | OPNA2608 <christoph.neidahl@gmail.com> | 2022-02-22 21:18:17 +0100 |
| commit | 3e3cb9b7c98854bb3c8a88179bfa972753978a3c (patch) | |
| tree | a055d28da3e1120532e9bd0e540aa750c48710c7 /pkgs | |
| parent | 23c7839aff8d0fe3e9f8d6eb6c239f620a312bfd (diff) | |
| download | nixlib-3e3cb9b7c98854bb3c8a88179bfa972753978a3c.tar nixlib-3e3cb9b7c98854bb3c8a88179bfa972753978a3c.tar.gz nixlib-3e3cb9b7c98854bb3c8a88179bfa972753978a3c.tar.bz2 nixlib-3e3cb9b7c98854bb3c8a88179bfa972753978a3c.tar.lz nixlib-3e3cb9b7c98854bb3c8a88179bfa972753978a3c.tar.xz nixlib-3e3cb9b7c98854bb3c8a88179bfa972753978a3c.tar.zst nixlib-3e3cb9b7c98854bb3c8a88179bfa972753978a3c.zip | |
mednafen: Fix on Darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/emulators/mednafen/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/applications/emulators/mednafen/default.nix b/pkgs/applications/emulators/mednafen/default.nix index 235386cba258..bcc58ccb76a0 100644 --- a/pkgs/applications/emulators/mednafen/default.nix +++ b/pkgs/applications/emulators/mednafen/default.nix @@ -15,6 +15,7 @@ , libsndfile , pkg-config , zlib +, libiconv }: stdenv.mkDerivation rec { @@ -31,20 +32,25 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_net - alsa-lib flac freeglut - libGL - libGLU - libX11 libcdio libjack2 libsamplerate libsndfile zlib + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libGL + libGLU + libX11 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv ]; - hardeningDisable = [ "pic" ]; + hardeningDisable = [ "pic" "format" ]; + + enableParallelBuilding = true; postInstall = '' mkdir -p $out/share/doc @@ -87,6 +93,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b69adcd4c524..1987f19ec1fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7820,7 +7820,9 @@ with pkgs; mdp = callPackage ../applications/misc/mdp { }; - mednafen = callPackage ../applications/emulators/mednafen { }; + mednafen = callPackage ../applications/emulators/mednafen { + inherit (darwin) libiconv; + }; mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; |