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

xorg: expression cleanup

Browse Source 
The generating script needed to be updated not to overwrite the
hardening changes back.
This commit is contained in:
Vladimír Čunát 2016-09-16 22:39:38 +02:00
parent 16ed17d6c8
commit 772d14d8c2
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2362,21 +2362,6 @@ let
meta.platforms = stdenv.lib.platforms.unix; 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 ;}; }) // {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" { xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {
name = "xorg-sgml-doctools-1.11"; name = "xorg-sgml-doctools-1.11";
builder = ./builder.sh; builder = ./builder.sh;

4
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View File

@ -239,7 +239,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;};