diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 7aca033c147b..22a67b13e0b0 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libogg, libvorbis, enableNativeMidi ? false, fluidsynth ? null }: +{ stdenv, fetchurl, SDL, libogg, libvorbis, smpeg, enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { pname = "SDL_mixer"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; - buildInputs = [SDL libogg libvorbis fluidsynth]; + buildInputs = [SDL libogg libvorbis fluidsynth smpeg]; configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi " --enable-music-native-midi-gpl"; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 30c1f4937ecf..c2473ae2c5db 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk, m4, pkgconfig, mesa }: +{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk, m4, pkgconfig, mesa, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ SDL autoconf automake libtool gtk m4 pkgconfig mesa ]; + buildInputs = [ SDL gtk mesa ]; + + nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ]; preConfigure = '' touch NEWS AUTHORS ChangeLog @@ -26,6 +28,10 @@ stdenv.mkDerivation rec { -e 's,"SDL_thread.h",,' \ -e 's,"SDL_types.h",,' \ $out/include/smpeg/*.h + + wrapProgram $out/bin/smpeg-config \ + --prefix PATH ":" "${pkgconfig}/bin" \ + --prefix PKG_CONFIG_PATH ":" "${SDL}/lib/pkgconfig" ''; meta = { diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix new file mode 100644 index 000000000000..1d0bf636e2e9 --- /dev/null +++ b/pkgs/games/onscripter-en/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl +, libpng, libjpeg, libogg, libvorbis, freetype, smpeg +, SDL, SDL_image, SDL_mixer, SDL_ttf }: + + +stdenv.mkDerivation rec { + name = "onscripter-en-20110930"; + + src = fetchurl { + url = "http://unclemion.com/dev/attachments/download/36/${name}-src.tar.bz2"; + sha256 = "1kzm6d894c0ihgkwhd03x3kaqqz0sb6kf0r86xrrz12y309zfam6"; + }; + + buildInputs = [ libpng libjpeg libogg libvorbis freetype smpeg + SDL SDL_image SDL_mixer SDL_ttf + ]; + + configureFlags = [ "--no-werror" ]; + + # Without this libvorbisfile.so is not getting linked properly for some reason. + NIX_CFLAGS_LINK = [ "-lvorbisfile" ]; + + preBuild = '' + sed -i 's/.dll//g' Makefile + ''; + + meta = with stdenv.lib; { + description = "Japanese visual novel scripting engine"; + homepage = "http://dev.haeleth.net/onscripter.shtml"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = maintainers.abbradar; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 513431f29cfb..ba933820701e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1871,6 +1871,8 @@ let opencryptoki = callPackage ../tools/security/opencryptoki { }; + onscripter-en = callPackage ../games/onscripter-en { }; + opendbx = callPackage ../development/libraries/opendbx { }; opendkim = callPackage ../development/libraries/opendkim { };