summary refs log tree commit diff
path: root/pkgs/tools/package-management
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/tools/package-management
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/tools/package-management')
-rw-r--r--pkgs/tools/package-management/checkinstall/default.nix2
-rw-r--r--pkgs/tools/package-management/clib/default.nix2
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix
index 8ab9001573a2..fea6ccedd34f 100644
--- a/pkgs/tools/package-management/checkinstall/default.nix
+++ b/pkgs/tools/package-management/checkinstall/default.nix
@@ -44,6 +44,8 @@ stdenv.mkDerivation {
 
   buildInputs = [gettext];
 
+  hardeningDisable = [ "fortify" ];
+
   preBuild = ''
     makeFlagsArray=(PREFIX=$out)
 
diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix
index c1f76bca14b1..cd9499d9146d 100644
--- a/pkgs/tools/package-management/clib/default.nix
+++ b/pkgs/tools/package-management/clib/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "08n2i3dyh5vnrb74a6wlqqn67c9nwkq0v0v651zzha495mqbciq7";
   };
 
+  hardeningDisable = [ "fortify" ];
+
   makeFlags = "PREFIX=$(out)";
 
   buildInputs = [ curl ];