From 936dfeb700d185b3299a17308b548746f95e8900 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 26 Jan 2016 02:04:05 +0100
Subject: xorg.sessreg: Fix build on gcc-5

---
 pkgs/servers/x11/xorg/overrides.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'pkgs/servers/x11')

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 7bd179067cd0..b3d13c9c2589 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -440,4 +440,8 @@ in
     configureFlags = "--with-cpp=${args.mcpp}/bin/mcpp";
   };
 
+  sessreg = attrs: attrs // {
+    preBuild = "sed -i 's|gcc -E|gcc -E -P|' man/Makefile";
+  };
+
 }
-- 
cgit 1.4.1


From f519a255a56e7c42d04d1beb666d685078cc7e18 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 4 Apr 2016 14:08:53 +0000
Subject: xorg: switch off bindnow hardening for all packages

X otherwise fails to load modules.
---
 pkgs/servers/x11/xorg/builder.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkgs/servers/x11')

diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index f5b8803a98a3..aabc34dce60c 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -50,5 +50,7 @@ fi
 
 enableParallelBuilding=1
 
+# breaks module loading
+hardeningDisable="bindnow"
 
 genericBuild
-- 
cgit 1.4.1


From f7da99c7ff49e149a3f3bae57b80f52df53d63b3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 12 Aug 2016 11:56:58 +0000
Subject: xorg.xorgserver: disable relro hardening

Fixes modesetting module loading.
---
 pkgs/servers/x11/xorg/overrides.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs/servers/x11')

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 5660957011c7..bcef1a5419f6 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -430,6 +430,7 @@ in
                                         # and there are no fonts in this package anyway
           "--enable-glamor"
         ];
+        hardeningDisable = [ "relro" ];
         postInstall = ''
           rm -fr $out/share/X11/xkb/compiled
           ln -s /var/tmp $out/share/X11/xkb/compiled
-- 
cgit 1.4.1


From 27b9f5d65ee452c9a1a49a2e245b2a45ee1d65ab Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 14 Aug 2016 02:13:16 +0000
Subject: xorg.*: disable relro/bindnow hardening

Breaks the module system at runtime otherwise.
---
 pkgs/servers/x11/xorg/builder.sh    | 3 ---
 pkgs/servers/x11/xorg/default.nix   | 4 +++-
 pkgs/servers/x11/xorg/overrides.nix | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'pkgs/servers/x11')

diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index 15da0b51795b..055886374df4 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -46,7 +46,4 @@ fi
 
 enableParallelBuilding=1
 
-# breaks module loading
-hardeningDisable="bindnow"
-
 genericBuild
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 4a2ac2469d82..24b6cafd1bc2 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -9,7 +9,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;};
 
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index bcef1a5419f6..5660957011c7 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -430,7 +430,6 @@ in
                                         # and there are no fonts in this package anyway
           "--enable-glamor"
         ];
-        hardeningDisable = [ "relro" ];
         postInstall = ''
           rm -fr $out/share/X11/xkb/compiled
           ln -s /var/tmp $out/share/X11/xkb/compiled
-- 
cgit 1.4.1