about summary refs log tree commit diff
path: root/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-09-16 22:39:38 +0200
committerVladimír Čunát <vcunat@gmail.com>2016-09-16 22:41:20 +0200
commit772d14d8c243c8076ca71f202d0c71546e94ae19 (patch)
treef69edcea902d02e80645f8c6813ac9678b7a24f4 /pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
parent16ed17d6c86da386fcb9d659700cd364beb08fa7 (diff)
downloadnixlib-772d14d8c243c8076ca71f202d0c71546e94ae19.tar
nixlib-772d14d8c243c8076ca71f202d0c71546e94ae19.tar.gz
nixlib-772d14d8c243c8076ca71f202d0c71546e94ae19.tar.bz2
nixlib-772d14d8c243c8076ca71f202d0c71546e94ae19.tar.lz
nixlib-772d14d8c243c8076ca71f202d0c71546e94ae19.tar.xz
nixlib-772d14d8c243c8076ca71f202d0c71546e94ae19.tar.zst
nixlib-772d14d8c243c8076ca71f202d0c71546e94ae19.zip
xorg: expression cleanup
The generating script needed to be updated not to overwrite the
hardening changes back.
Diffstat (limited to 'pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl')
-rwxr-xr-xpkgs/servers/x11/xorg/generate-expr-from-tarballs.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 054e3f490e44..74c5ae9d9b89 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -239,7 +239,9 @@ let
   mkDerivation = name: attrs:
     let newAttrs = (overrides."\${name}" or (x: x)) attrs;
         stdenv = newAttrs.stdenv or args.stdenv;
-    in stdenv.mkDerivation (removeAttrs newAttrs [ "stdenv" ]);
+      in stdenv.mkDerivation ((removeAttrs newAttrs [ "stdenv" ]) // {
+        hardeningDisable = [ "bindnow" "relro" ];
+      });
 
   overrides = import ./overrides.nix {inherit args xorg;};