Merge branch 'hardened-stdenv' into staging

Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
This commit is contained in:
obadz
2016-08-22 01:19:35 +01:00
468 changed files with 1777 additions and 1453 deletions
+2
View File
@@ -12,6 +12,8 @@ stdenv.mkDerivation {
makeFlags = "LINK=gcc CFLAGS=-O2";
hardeningDisable = [ "format" ];
installPhase = ''
mkdir -p $out/include/dlx $out/share/dlx/{examples,doc} $out/bin
mv -v masm mon dasm $out/bin/
+5 -3
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "dosbox-0.74";
src = fetchurl {
url = "mirror://sourceforge/dosbox/${name}.tar.gz";
sha256 = "01cfjc5bs08m4w79nbxyv7rnvzq2yckmgrbq36njn06lw8b4kxqk";
@@ -17,9 +17,11 @@ stdenv.mkDerivation rec {
];
patchFlags = "-p0";
hardeningDisable = [ "format" ];
buildInputs = [ SDL mesa ];
desktopItem = makeDesktopItem {
name = "dosbox";
exec = "dosbox";
+2
View File
@@ -11,6 +11,8 @@ stdenv.mkDerivation {
buildInputs = [ allegro openal mesa zlib hawknl freeglut libX11
libXxf86vm libXcursor libXpm ];
hardeningDisable = [ "format" ];
installPhase = ''
mkdir -p $out/bin
cp fakenes $out/bin
+6 -4
View File
@@ -6,9 +6,11 @@ stdenv.mkDerivation {
url = http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz;
sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq";
};
buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ];
hardeningDisable = [ "format" ];
preConfigure = ''
# Some C++ incompatibility fixes
sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Main.cpp
@@ -20,10 +22,10 @@ stdenv.mkDerivation {
# Remove PATH environment variable from install script
sed -i -e "s|export PATH=|#export PATH=|" ./install.sh
'';
buildPhase = "make all";
installPhase = "PREFIX=$out make install";
meta = {
description = "A Nintendo 64 Emulator";
license = stdenv.lib.licenses.gpl2Plus;
+2
View File
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
# nondeterministic failures when creating directories
enableParallelBuilding = false;
hardeningDisable = [ "format" ];
buildInputs = [ pkgconfig SDL2 alsaLib gtk3 mesa_glu mesa makeWrapper
libarchive libao unzip xdg_utils gsettings_desktop_schemas ];
+6 -1
View File
@@ -2,13 +2,18 @@
stdenv.mkDerivation rec {
name = "uae-0.8.29";
src = fetchurl {
url = "http://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/${name}.tar.bz2";
sha256 = "05s3cd1rd5a970s938qf4c2xm3l7f54g5iaqw56v8smk355m4qr4";
};
configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ];
buildInputs = [ pkgconfig gtk alsaLib SDL ];
hardeningDisable = [ "format" ];
meta = {
description = "Ultimate/Unix/Unusable Amiga Emulator";
license = stdenv.lib.licenses.gpl2Plus;