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

xorg.*: disable relro/bindnow hardening 

Breaks the module system at runtime otherwise.
This commit is contained in:
Robin Gloster 2016-08-14 02:13:16 +00:00
parent 8071cafe66
commit 27b9f5d65e
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/servers/x11/xorg/builder.sh
View File

@ -46,7 +46,4 @@ fi
enableParallelBuilding=1 enableParallelBuilding=1
# breaks module loading
hardeningDisable="bindnow"
genericBuild genericBuild

4
pkgs/servers/x11/xorg/default.nix
View File

@ -9,7 +9,9 @@ let
mkDerivation = name: attrs: mkDerivation = name: attrs:
let newAttrs = (overrides."${name}" or (x: x)) attrs; let newAttrs = (overrides."${name}" or (x: x)) attrs;
stdenv = newAttrs.stdenv or args.stdenv; 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;}; overrides = import ./overrides.nix {inherit args xorg;};

1
pkgs/servers/x11/xorg/overrides.nix
View File

@ -430,7 +430,6 @@ in
# and there are no fonts in this package anyway # and there are no fonts in this package anyway
"--enable-glamor" "--enable-glamor"
]; ];
hardeningDisable = [ "relro" ];
postInstall = '' postInstall = ''
rm -fr $out/share/X11/xkb/compiled rm -fr $out/share/X11/xkb/compiled
ln -s /var/tmp $out/share/X11/xkb/compiled ln -s /var/tmp $out/share/X11/xkb/compiled