diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2017-11-13 18:07:57 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2017-11-13 18:07:57 -0600 |
| commit | 010475bb8b3722390cbdc1606773df70314a6ec2 (patch) | |
| tree | fbfb3bc3c6ef3af747f625668cf9b852435175c5 /pkgs/misc/emulators/dosbox | |
| parent | bdce9327a12e6fec8a79d38ae456bb02c20ac1a8 (diff) | |
| download | nixpkgs-010475bb8b3722390cbdc1606773df70314a6ec2.tar nixpkgs-010475bb8b3722390cbdc1606773df70314a6ec2.tar.gz nixpkgs-010475bb8b3722390cbdc1606773df70314a6ec2.tar.bz2 nixpkgs-010475bb8b3722390cbdc1606773df70314a6ec2.tar.lz nixpkgs-010475bb8b3722390cbdc1606773df70314a6ec2.tar.xz nixpkgs-010475bb8b3722390cbdc1606773df70314a6ec2.tar.zst nixpkgs-010475bb8b3722390cbdc1606773df70314a6ec2.zip | |
dosbox: build on darwin
fixes dosbox issue on dariwn
Diffstat (limited to 'pkgs/misc/emulators/dosbox')
| -rw-r--r-- | pkgs/misc/emulators/dosbox/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index f7400e4b761..454427c9066 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, SDL, makeDesktopItem, mesa }: +{ stdenv, lib, fetchurl, SDL, makeDesktopItem, mesa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "dosbox-0.74"; src = fetchurl { @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch?revision=1.1"; sha256 = "03iv1ph7fccfw327ngnhvzwyiix7fsbdb5mmpxivzkidhlrssxq9"; }) + (fetchurl { + url = "https://svnweb.freebsd.org/ports/head/emulators/dosbox/files/patch-src_gui_sdlmain.cpp?revision=435580&view=co&pathrev=435580"; + sha256 = "1mbj5wrn53k0zds2adys34949vzsbfgm0pmsyx14v9j0cxi7drca"; + name = "patch-src_gui_sdlmain.cpp"; + }) ]; patchFlags = "-p0"; @@ -22,6 +27,8 @@ stdenv.mkDerivation rec { buildInputs = [ SDL mesa ]; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + desktopItem = makeDesktopItem { name = "dosbox"; exec = "dosbox"; |