diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 12:45:06 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 18:34:53 +0100 |
commit | 9443129b08b37a6f4267d257cd8d42dd92a2539c (patch) | |
tree | aec261361299cc2d85827dbcf5d03b594ae85e28 /pkgs/misc/emulators | |
parent | f78534ca0f8ec63d79370eb2367605579efba088 (diff) | |
parent | f6d51f7717cffd8b220ce02498db8b8359b5964c (diff) | |
download | nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.gz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.bz2 nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.lz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.xz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.zst nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.zip |
Merge master into stdenv-updates
Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/wine/unstable.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/winetricks.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/emulators/zsnes/default.nix | 24 |
3 files changed, 25 insertions, 7 deletions
diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index 0cb81a8185a4..f19ef0fcc7f3 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.8"; + version = "1.7.10"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "010qa6xn0b0161kcmm43yr0bp39iddb6d5i27mpl229shrgpzq9h"; + sha256 = "1nybsp4pga0jhx6rm6ngpa2ixsbj75p8w22r9d70x4zgjx5hw9s4"; }; gecko = fetchurl { diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index e3fe48ec8a3c..f47902cd0bf1 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -2,13 +2,13 @@ , cabextract, unzip, p7zip, gnused, gnugrep, bash } : stdenv.mkDerivation rec { - rev = "1078"; + rev = "1083"; name = "winetricks-${rev}"; src = fetchsvn { url = "http://winetricks.googlecode.com/svn/trunk"; inherit rev; - sha256 = "0ipvld0r5h6x2pgqkqa82q0w9flx6fn9aha8fd7axf5ji2gzmidm"; + sha256 = "0zakwn7g2ni6xw92i1y3pngyaxsr93714s4jy11adf7rxdkj0a32"; }; buildInputs = [ perl which ]; diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index a2896e70d174..6ee57e0cddfe 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -15,11 +15,29 @@ stdenv.mkDerivation { patch -p0 < ${./zsnes-1.51-libpng15.patch} ''; + buildInputs = [ nasm SDL zlib libpng ncurses mesa ]; + preConfigure = '' cd src - ''; - buildInputs = [ nasm SDL zlib libpng ncurses mesa ]; + sed -i "/^STRIP/d" configure + + # Fix for undefined strncasecmp() + echo '#include <strings.h>' > tmp.cpp + cat tmp.cpp tools/strutil.h > tools/strutil.h.new + mv tools/strutil.h.new tools/strutil.h + + # Fix for undefined system() + echo '#include <stdlib.h>' > tmp.cpp + cat tmp.cpp tools/depbuild.cpp > tools/depbuild.cpp.new + mv tools/depbuild.cpp.new tools/depbuild.cpp + + # Fix for lots of undefined strcmp, strncmp etc. + echo '#include <string.h>' > tmp.cpp + cat tmp.cpp parsegen.cpp > parsegen.cpp.new + mv parsegen.cpp.new parsegen.cpp + ''; + configureFlags = "--enable-release"; @@ -29,4 +47,4 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://www.zsnes.com; }; -} \ No newline at end of file +} |