alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

xorg: replace edits to generated script

Browse source 
- update versions in .list files to match
- move cf-files postInstall to overrides.nix
This commit is contained in:
David McFarland 2018-05-19 17:21:40 -03:00
parent 4f9c3af6ec
commit 2b7fe3bf5a
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/servers/x11/xorg/default.nix
View file

@ -2570,9 +2570,6 @@ let
url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2;
sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd";
};
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ];
meta.platforms = stdenv.lib.platforms.unix;

2
pkgs/servers/x11/xorg/old.list
View file

@ -3,7 +3,7 @@ mirror://xorg/individual/app/xclock-1.0.7.tar.bz2
mirror://xorg/individual/app/xdm-1.1.11.tar.bz2
mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2
mirror://xorg/individual/app/xfs-1.1.4.tar.bz2
mirror://xorg/individual/app/xinit-1.3.4.tar.bz2
mirror://xorg/individual/app/xinit-1.4.0.tar.bz2
mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2
mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2
mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2

6
pkgs/servers/x11/xorg/overrides.nix
View file

@ -650,6 +650,12 @@ in
];
};
xorgcffiles = attrs: attrs // {
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
'';
};
xwd = attrs: attrs // {
buildInputs = with xorg; attrs.buildInputs ++ [libXt libxkbfile];
};

8
pkgs/servers/x11/xorg/tarballs-7.7.list
View file

@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2
mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2
mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2
mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
@ -101,7 +101,7 @@ mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2
mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2
mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2
mirror://xorg/individual/app/twm-1.0.9.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2
@ -131,7 +131,7 @@ mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2
mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
@ -164,7 +164,7 @@ mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2