nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 19:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #244216 from OPNA2608/fix/dosbox_darwin

Browse Source 
dosbox: Fix on Darwin
This commit is contained in:
Nikolay Korotkiy 2023-07-25 00:42:32 +04:00 committed by GitHub
commit 13a208d7ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/emulators/dosbox/default.nix
View File

@ -9,6 +9,7 @@
, graphicsmagick
, libGL
, libGLU
, OpenGL
, libpng
, makeDesktopItem
}:
@ -32,10 +33,13 @@ stdenv.mkDerivation rec {
SDL
SDL_net
SDL_sound
libpng
] ++ (if stdenv.hostPlatform.isDarwin then [
OpenGL
] else [
libGL
libGLU
libpng
];
]);
hardeningDisable = [ "format" ];

1
pkgs/top-level/all-packages.nix
View File

@ -2453,6 +2453,7 @@ with pkgs;
dlx = callPackage ../applications/emulators/dlx { };
dosbox = callPackage ../applications/emulators/dosbox {
inherit (darwin.apple_sdk.frameworks ) OpenGL;
SDL = if stdenv.isDarwin then SDL else SDL_compat;
};