summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorobadz <obadz-git@obadz.com>2016-08-22 01:19:35 +0100
committerobadz <obadz-git@obadz.com>2016-08-22 01:19:35 +0100
commit24a9183f907cec515724484d84b0cf236de2e8d0 (patch)
tree67ab37c4de5d8e8f17b78cc8c6680f25edf7d930 /pkgs/applications/video
parentba50fd71700bf796ea2339115733ca5a850015ea (diff)
parentb092538811a2bd4454ed9b056952c0a10f091076 (diff)
downloadnixlib-24a9183f907cec515724484d84b0cf236de2e8d0.tar
nixlib-24a9183f907cec515724484d84b0cf236de2e8d0.tar.gz
nixlib-24a9183f907cec515724484d84b0cf236de2e8d0.tar.bz2
nixlib-24a9183f907cec515724484d84b0cf236de2e8d0.tar.lz
nixlib-24a9183f907cec515724484d84b0cf236de2e8d0.tar.xz
nixlib-24a9183f907cec515724484d84b0cf236de2e8d0.tar.zst
nixlib-24a9183f907cec515724484d84b0cf236de2e8d0.zip
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
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/aegisub/default.nix2
-rw-r--r--pkgs/applications/video/kino/default.nix10
-rw-r--r--pkgs/applications/video/subtitleeditor/default.nix2
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index 92a2f4fb6343..39a85a03199d 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  hardeningDisable = [ "bindnow" "relro" ];
+
   postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub";
 
   meta = {
diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix
index 2503d78183f3..ea5158270876 100644
--- a/pkgs/applications/video/kino/default.nix
+++ b/pkgs/applications/video/kino/default.nix
@@ -67,13 +67,10 @@ stdenv.mkDerivation {
       pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages 
 
   configureFlags = "--enable-local-ffmpeg=no";
-  #preConfigure = "
-  #  grep 11 env-vars
-  #  ex
-  #";
 
-  patches = [ ./kino-1.3.4-v4l1.patch ./kino-1.3.4-libav-0.7.patch ./kino-1.3.4-libav-0.8.patch ]; #./kino-1.3.4-libavcodec-pkg-config.patch ];
+  hardeningDisable = [ "format" ];
 
+  patches = [ ./kino-1.3.4-v4l1.patch ./kino-1.3.4-libav-0.7.patch ./kino-1.3.4-libav-0.8.patch ]; #./kino-1.3.4-libavcodec-pkg-config.patch ];
 
   postInstall = "
     rpath=`patchelf --print-rpath \$out/bin/kino`;
@@ -86,8 +83,7 @@ stdenv.mkDerivation {
     done
   ";
 
-
-  meta = { 
+  meta = {
       description = "Non-linear DV editor for GNU/Linux";
       homepage = http://www.kinodv.org/;
       license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
index c9655e2a4f27..e3cd242bd73c 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  hardeningDisable = [ "format" ];
+
   patches = [ ./subtitleeditor-0.52.1-build-fix.patch ];
 
   preConfigure = ''