public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-05-30 19:39:34 +00:00
parent 365379857f 2661511cdb
commit 2d382f3d98
711 changed files with 49079 additions and 11672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/dolphin-emu/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
cmakeFlags = ''
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
-DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0
-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0
-DCMAKE_BUILD_TYPE=Release
-DENABLE_LTO=True
'';
pkgs/misc/emulators/dolphin-emu/master.nix
+1 -1
View File
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
cmakeFlags = ''
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
-DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0
-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0
-DCMAKE_BUILD_TYPE=Release
-DENABLE_LTO=True
'';
pkgs/misc/emulators/mednaffe/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
prePatch = ''
substituteInPlace src/mednaffe.c --replace "binpath = NULL" "binpath = \"${mednafen}/bin/mednafen\""
substituteInPlace src/mednaffe.c --replace "binpath = NULL" "binpath = g_strdup( \"${mednafen}/bin/mednafen\" )"
'';
buildInputs = [ pkgconfig gtk2 mednafen ];
pkgs/misc/emulators/pcsx2/default.nix
+1 -1
View File
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
-DGLSL_SHADER_DIR="$out/share/pcsx2" \
-DGTK2_GLIBCONFIG_INCLUDE_DIR='${glib.out}/lib/glib-2.0/include' \
-DGTK2_GDKCONFIG_INCLUDE_DIR='${gtk2.out}/lib/gtk-2.0/include' \
-DGTK2_INCLUDE_DIRS='${gtk2}/include/gtk-2.0' \
-DGTK2_INCLUDE_DIRS='${gtk2.dev}/include/gtk-2.0' \
-DPACKAGE_MODE=TRUE \
-DPLUGIN_DIR="$out/lib/pcsx2" \
-DREBUILD_SHADER=TRUE \
pkgs/misc/emulators/pcsxr/default.nix
+87
View File
@@ -0,0 +1,87 @@
{ stdenv, fetchurl, autoreconfHook, intltool, pkgconfig, gtk3, SDL2, xorg
, gsettings_desktop_schemas, makeWrapper, libcdio, nasm, ffmpeg, file
, fetchpatch }:
stdenv.mkDerivation rec {
name = "pcsxr-${version}";
version = "1.9.94";
# codeplex does not support direct downloading
src = fetchurl {
url = "mirror://debian/pool/main/p/pcsxr/pcsxr_${version}.orig.tar.xz";
sha256 = "0q7nj0z687lmss7sgr93ij6my4dmhkm2nhjvlwx48dn2lxl6ndla";
};
patches = [
( fetchpatch {
url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/01_fix-i386-exec-stack.patch?h=debian/1.9.94-2";
sha256 = "17497wjxd6b92bj458s2769d9bpp68ydbvmfs9gp51yhnq4zl81x";
})
( fetchpatch {
url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/02_disable-ppc-auto-dynarec.patch?h=debian/1.9.94-2";
sha256 = "0v8n79z034w6cqdrzhgd9fkdpri42mzvkdjm19x4asz94gg2i2kf";
})
( fetchpatch {
url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/03_fix-plugin-dir.patch?h=debian/1.9.94-2";
sha256 = "0vkl0mv6whqaz79kvvvlmlmjpynyq4lh352j3bbxcr0vjqffxvsy";
})
( fetchpatch {
url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/04_update-homedir-symlinks.patch?h=debian/1.9.94-2";
sha256 = "18r6n025ybr8fljfsaqm4ap31wp8838j73lrsffi49fkis60dp4j";
})
( fetchpatch {
url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/05_format-security.patch?h=debian/1.9.94-2";
sha256 = "03m4kfc9bk5669hf7ji1anild08diliapx634f9cigyxh72jcvni";
})
( fetchpatch {
url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/06_warnings.patch?h=debian/1.9.94-2";
sha256 = "0iz3g9ihnhisfgrzma9l74y4lhh57na9h41bmiam1millb796g71";
})
( fetchpatch {
url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/07_non-linux-ip-addr.patch?h=debian/1.9.94-2";
sha256 = "14vb9l0l4nzxcymhjjs4q57nmsncmby9qpdr7c19rly5wavm4k77";
})
( fetchpatch {
url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/08_reproducible.patch?h=debian/1.9.94-2";
sha256 = "1cx9q59drsk9h6l31097lg4aanaj93ysdz5p88pg9c7wvxk1qz06";
})
];
buildInputs = [
autoreconfHook intltool pkgconfig gtk3 SDL2 xorg.libXv xorg.libXtst
makeWrapper libcdio nasm ffmpeg file
];
dynarecTarget =
if stdenv.isx86_64 then "x86_64"
else if stdenv.isi686 then "x86"
else "no"; #debian patch 2 says ppc doesn't work
configureFlags = [
"--enable-opengl"
"--enable-ccdda"
"--enable-libcdio"
"--enable-dynarec=${dynarecTarget}"
];
postInstall = ''
wrapProgram "$out/bin/pcsxr" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
mkdir -p "$out/share/doc/${name}"
cp README \
AUTHORS \
doc/keys.txt \
doc/tweaks.txt \
ChangeLog.df \
ChangeLog \
"$out/share/doc/${name}"
'';
meta = with stdenv.lib; {
description = "Playstation 1 emulator";
homepage = http://pcsxr.codeplex.com/;
maintainers = with maintainers; [ rardiol ];
license = licenses.gpl2Plus;
platforms = platforms.all;
};
}
pkgs/misc/emulators/wxmupen64plus/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
configurePhase = ''
tar xf ${mupen64plus.src}
APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api)
export CXXFLAGS="-I${libX11}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\""
export CXXFLAGS="-I${libX11.dev}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\""
export LDFLAGS="-lwx_gtk2u_adv-2.9"
python waf configure --mupenapi=$APIDIR --wxconfig=`type -P wx-config` --prefix=$out
'';