diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-09-16 22:39:38 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-09-16 22:41:20 +0200 |
commit | 772d14d8c243c8076ca71f202d0c71546e94ae19 (patch) | |
tree | f69edcea902d02e80645f8c6813ac9678b7a24f4 /pkgs/servers/x11 | |
parent | 16ed17d6c86da386fcb9d659700cd364beb08fa7 (diff) | |
download | nixlib-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')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 15 | ||||
-rwxr-xr-x | pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 4 |
2 files changed, 3 insertions, 16 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 196670750da5..6cdca83256d9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2362,21 +2362,6 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; - # TODO: - # With the current state of ./generate-expr-from-tarballs.pl, - # this will get overwritten when next invoked. - # Could add a special case to ./generate-expr-from-tarballs.pl, - # or perhaps there's a cleaner solution. - #xquartz = (mkDerivation "xquartz" { - # name = "xorg-server-1.14.6"; - # builder = ./builder.sh; - # src = fetchurl { - # url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2; - # sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8"; - # }; - # buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; - #}) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; - xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; 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;}; |