summary refs log tree commit diff
path: root/pkgs/development/libraries/mesa/default.nix
diff options
context:
space:
mode:
authorAnton-Latukha <anton.latukha@gmail.com>2018-07-12 12:34:45 +0300
committerAnton-Latukha <anton.latukha@gmail.com>2018-07-22 21:41:48 +0300
commit7ebc3ab2a62b7099a5d67b13ba94a2f6574fe90d (patch)
treee27740b9e2243e972e353bf73b0bf30fdbf934c8 /pkgs/development/libraries/mesa/default.nix
parent4c77fdef4ada69da7ae09b867ee8e98c575cc8ee (diff)
downloadnixlib-7ebc3ab2a62b7099a5d67b13ba94a2f6574fe90d.tar
nixlib-7ebc3ab2a62b7099a5d67b13ba94a2f6574fe90d.tar.gz
nixlib-7ebc3ab2a62b7099a5d67b13ba94a2f6574fe90d.tar.bz2
nixlib-7ebc3ab2a62b7099a5d67b13ba94a2f6574fe90d.tar.lz
nixlib-7ebc3ab2a62b7099a5d67b13ba94a2f6574fe90d.tar.xz
nixlib-7ebc3ab2a62b7099a5d67b13ba94a2f6574fe90d.tar.zst
nixlib-7ebc3ab2a62b7099a5d67b13ba94a2f6574fe90d.zip
mesa: cleanup: rm defunct glx-rts & sysfs flags, grsec/PaX patch
Config log:

```
configure: WARNING: unrecognized options: --disable-glx-rts, --enable-sysfs
```
Diffstat (limited to 'pkgs/development/libraries/mesa/default.nix')
-rw-r--r--pkgs/development/libraries/mesa/default.nix4
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 93354dc9a71f..ab2aa0ce3ae8 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -4,7 +4,6 @@
 , llvmPackages, libffi, libomxil-bellagio, libva-minimal
 , libelf, libvdpau, valgrind-light, python2
 , libglvnd
-, grsecEnabled ? false
 , enableRadv ? true
 , galliumDrivers ? null
 , driDrivers ? null
@@ -87,7 +86,6 @@ let self = stdenv.mkDerivation {
   #  revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved
   #  ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog
   patches = [
-    ./glx_ro_text_segm.patch # fix for grsecurity/PaX
     ./symlink-drivers.patch
     ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
   ];
@@ -112,7 +110,6 @@ let self = stdenv.mkDerivation {
       ("--with-vulkan-drivers=" +
         builtins.concatStringsSep "," vulkanDrivers))
   ++ [
-    (enableFeature grsecEnabled "glx-rts")
     (enableFeature stdenv.isLinux "dri3")
     (enableFeature stdenv.isLinux "nine") # Direct3D in Wine
     "--enable-libglvnd"
@@ -131,7 +128,6 @@ let self = stdenv.mkDerivation {
     "--enable-xvmc"
     "--enable-vdpau"
     "--enable-shared-glapi"
-    "--enable-sysfs"
     "--enable-llvm-shared-libs"
     "--enable-omx-bellagio"
     "--enable-va"