Unverified Commit 782caacd authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge pull request #215686 from superherointj/pkg-dosbox-staging-0.80.1 

dosbox-staging: 0.78.1 -> 0.80.1
parents e5530aba d8b83ecc

pkgs/applications/emulators/dosbox-staging/default.nix

+25 −18
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, SDL2

, SDL2_net

, alsa-lib

{ alsa-lib

, copyDesktopItems

, fetchFromGitHub

, fluidsynth

, glib

, gtest

, lib

, libGL

, libGLU

, libjack2

, libmt32emu

, libogg

, libpng

, libpulseaudio

, libslirp

, libsndfile

, makeDesktopItem

, makeWrapper

, meson

, libmt32emu

, ninja

, opusfile

, pkg-config

, libpulseaudio

, glib

, libjack2

, libsndfile

, irr1

, SDL2

, SDL2_image

, SDL2_net

, speexdsp

, stdenv

}:



stdenv.mkDerivation rec {

  pname = "dosbox-staging";

  version = "0.78.1";

  version = "0.80.1";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = "v${version}";

    hash = "sha256-gozFZcJorZtbEK0joksig6qWmAMy03hmBHiyJMONfpk=";

    hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc=";

  };



  nativeBuildInputs = [
@@ -46,11 +49,10 @@ stdenv.mkDerivation rec { 
  ];



  buildInputs = [

    SDL2

    SDL2_net

    alsa-lib

    fluidsynth

    glib

    irr1

    libGL

    libGLU

    libjack2
@@ -61,9 +63,14 @@ stdenv.mkDerivation rec { 
    libslirp

    libsndfile

    opusfile

    SDL2

    SDL2_image

    SDL2_net

    speexdsp

  ];



  NIX_CFLAGS_COMPILE = [

    "-I${SDL2_image}/include/SDL2"

    "-I${SDL2_net}/include/SDL2"

  ];

pkgs/development/libraries/irr1/default.nix

0 → 100644
+28 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, cmake

}:



stdenv.mkDerivation rec {

  pname = "irr1";

  version = "1.9.4";



  src = fetchFromGitHub {

    owner = "berndporr";

    repo = "iir1";

    rev = version;

    hash = "sha256-T8gl51IkZIGq+6D5ge4Kb3wm5aw7Rhphmnf6TTGwHbs=";

  };



  nativeBuildInputs = [ cmake ];



  meta = {

    description = "A DSP IIR realtime filter library written in C++";

    downloadPage = "https://github.com/berndporr/iir1";

    homepage = "http://berndporr.github.io/iir1/";

    license = lib.licenses.mit;

    maintainers = [ lib.maintainers.AndersonTorres ];

    platforms = lib.platforms.unix;

  };

}

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -20477,6 +20477,8 @@ with pkgs; 














  ip2location-c = callPackage ../development/libraries/ip2location-c { };



























  irr1 = callPackage ../development/libraries/irr1 { };



























  irrlicht = if !stdenv.isDarwin then















    callPackage ../development/libraries/irrlicht { }















  else callPackage ../development/libraries/irrlicht/mac.nix {