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: cf7e7127c56a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 59ddb1454310
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 11, 2018

  1. SDL_sound: enable on Darwin

    @orivej
    orivej committed Nov 11, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    b3e2a48 View commit details

  2. dosbox: 0.74 -> 0.74-2

    @orivej
    orivej committed Nov 11, 2018
    Copy the full SHA
    65e0b5c View commit details

  3. Merge pull request #50216 from orivej/dosbox 

    dosbox: 0.74 -> 0.74-2
    @orivej-nixos
    orivej-nixos authored Nov 11, 2018
    Copy the full SHA
    59ddb14 View commit details
Showing with 11 additions and 22 deletions.
  1. +5 −3 pkgs/development/libraries/SDL_sound/default.nix
  2. +6 −19 pkgs/misc/emulators/dosbox/default.nix
8 changes: 5 additions & 3 deletions pkgs/development/libraries/SDL_sound/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, libvorbis, flac, libmikmod }:
{ stdenv, lib, fetchurl, SDL, libvorbis, flac, libmikmod }:

stdenv.mkDerivation rec {
name = "SDL_sound-${version}";
@@ -11,9 +11,11 @@ stdenv.mkDerivation rec {

buildInputs = [ SDL libvorbis flac libmikmod ];

meta = with stdenv.lib; {
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";

meta = with lib; {
description = "SDL sound library";
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.lgpl21;
homepage = https://www.icculus.org/SDL_sound/;
};
25 changes: 6 additions & 19 deletions pkgs/misc/emulators/dosbox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,16 @@
{ stdenv, lib, fetchurl, SDL, makeDesktopItem, libGLU_combined }:
{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng }:

stdenv.mkDerivation rec {
name = "dosbox-0.74";
name = "dosbox-0.74-2";

src = fetchurl {
url = "mirror://sourceforge/dosbox/${name}.tar.gz";
sha256 = "01cfjc5bs08m4w79nbxyv7rnvzq2yckmgrbq36njn06lw8b4kxqk";
sha256 = "1ksp1b5szi0vy4x55rm3j1y9wq5mlslpy8llpg87rpdyjlsk0xvh";
};

patches =
[ # Fix building with GCC 4.6.
(fetchurl {
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";

hardeningDisable = [ "format" ];

buildInputs = [ SDL libGLU_combined ];
buildInputs = [ SDL SDL_net SDL_sound libGLU_combined libpng ];

configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";

@@ -43,6 +28,8 @@ stdenv.mkDerivation rec {
cp ${desktopItem}/share/applications/* $out/share/applications
'';

enableParallelBuilding = true;

meta = with lib; {
homepage = http://www.dosbox.com/;
description = "A DOS emulator";