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

Merge pull request #57778 from dtzWill/update/xorg-misc-2019-03

Browse Source 
xorg: batch of updates, bump luit
This commit is contained in:
Will Dietz 2019-03-27 08:34:38 -05:00 committed by GitHub
commit 1aa5dc968f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 261 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -26,7 +26,7 @@ my %pcMap;
my %extraAttrs;
my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4");
my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext" );
$pcMap{$_} = $_ foreach @missingPCs;
$pcMap{"freetype2"} = "freetype";
$pcMap{"libpng12"} = "libpng";
@ -35,11 +35,13 @@ $pcMap{"dbus-1"} = "dbus";
$pcMap{"uuid"} = "libuuid";
$pcMap{"libudev"} = "udev";
$pcMap{"gl"} = "libGL";
$pcMap{"GL"} = "libGL";
$pcMap{"gbm"} = "mesa_noglu";
$pcMap{"\$PIXMAN"} = "pixman";
$pcMap{"\$RENDERPROTO"} = "xorgproto";
$pcMap{"\$DRI3PROTO"} = "xorgproto";
$pcMap{"\$DRI2PROTO"} = "xorgproto";
$pcMap{"\${XKBMODULE}"} = "libxkbfile";
my $downloadCache = "./download-cache";
@ -149,15 +151,15 @@ while (<>) {
}
if ($file =~ /AC_PATH_PROG\(BDFTOPCF/) {
push @requires, "bdftopcf";
push @nativeRequires, "bdftopcf";
}
if ($file =~ /AC_PATH_PROG\(MKFONTSCALE/) {
push @requires, "mkfontscale";
push @nativeRequires, "mkfontscale";
}
if ($file =~ /AC_PATH_PROG\(MKFONTDIR/) {
push @requires, "mkfontdir";
push @nativeRequires, "mkfontscale";
}
if ($file =~ /AM_PATH_PYTHON/) {
@ -173,17 +175,17 @@ while (<>) {
my $isFont;
if ($file =~ /XORG_FONT_BDF_UTILS/) {
push @requires, "bdftopcf", "mkfontdir";
push @nativeRequires, "bdftopcf", "mkfontscale";
$isFont = 1;
}
if ($file =~ /XORG_FONT_SCALED_UTILS/) {
push @requires, "mkfontscale", "mkfontdir";
push @nativeRequires, "mkfontscale";
$isFont = 1;
}
if ($file =~ /XORG_FONT_UCS2ANY/) {
push @requires, "fontutil", "mkfontscale";
push @nativeRequires, "fontutil", "mkfontscale";
$isFont = 1;
}
@ -213,6 +215,7 @@ while (<>) {
#process \@requires, $1 while $file =~ /PKG_CHECK_MODULES\([^,]*,\s*[\[]?([^\)\[]*)/g;
process \@requires, $1 while $file =~ /PKG_CHECK_MODULES\([^,]*,([^\)\,]*)/g;
process \@requires, $1 while $file =~ /AC_SEARCH_LIBS\([^,]*,([^\)\,]*)/g;
process \@requires, $1 while $file =~ /MODULES=\"(.*)\"/g;
process \@requires, $1 while $file =~ /REQUIRED_LIBS=\"(.*)\"/g;
process \@requires, $1 while $file =~ /REQUIRED_MODULES=\"(.*)\"/g;
@ -224,6 +227,7 @@ while (<>) {
process \@requires, $1 while $file =~ /ivo_requires=\"(.*)\"/g;
process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g;
push @nativeRequires, "gettext" if $file =~ /USE_GETTEXT/;
push @requires, "libxslt" if $pkg =~ /libxcb/;
push @requires, "gperf", "m4", "xorgproto" if $pkg =~ /xcbutil/;

17
pkgs/servers/x11/xorg/overrides.nix
View File

@ -49,10 +49,6 @@ self: super:
meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; };
});
fontcursormisc = super.fontcursormisc.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ self.mkfontscale ];
});
fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: {
postInstall =
''
@ -74,9 +70,7 @@ self: super:
inherit tradcpp;
});
mkfontdir = super.mkfontdir.overrideAttrs (attrs: {
preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${self.mkfontscale}/bin";
});
mkfontdir = self.mkfontscale;
libxcb = super.libxcb.overrideAttrs (attrs: {
configureFlags = [ "--enable-xkb" "--enable-xinput" ];
@ -288,10 +282,6 @@ self: super:
meta = attrs.meta // { platforms = stdenv.lib.platforms.linux; };
});
oclock = super.oclock.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ self.libxkbfile ];
});
setxkbmap = super.setxkbmap.overrideAttrs (attrs: {
postInstall =
''
@ -337,7 +327,6 @@ self: super:
outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
installFlags = "sdkdir=\${out}/include/xorg";
buildInputs = attrs.buildInputs ++ [ mtdev libevdev ];
});
xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: {
@ -350,13 +339,11 @@ self: super:
xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: rec {
outputs = [ "out" "dev" ];
buildInputs = attrs.buildInputs ++ [ libinput ];
installFlags = "sdkdir=\${dev}/include/xorg";
});
xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: {
outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev
buildInputs = attrs.buildInputs ++ [mtdev libevdev];
installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d";
});
@ -693,7 +680,7 @@ self: super:
});
xwd = super.xwd.overrideAttrs (attrs: {
buildInputs = with self; attrs.buildInputs ++ [libXt libxkbfile];
buildInputs = with self; attrs.buildInputs ++ [libXt];
});
xrdb = super.xrdb.overrideAttrs (attrs: {

47
pkgs/servers/x11/xorg/tarballs.list
View File

@ -1,4 +1,4 @@
ftp://ftp.invisible-island.net/luit/luit-20181211.tgz
https://invisible-mirror.net/archives/luit/luit-20190106.tgz
https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2
https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
@ -17,8 +17,7 @@ mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2
mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2
mirror://xorg/individual/app/ico-1.0.5.tar.bz2
mirror://xorg/individual/app/listres-1.0.4.tar.bz2
mirror://xorg/individual/app/mkfontdir-1.0.7.tar.bz2
mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2
mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2
mirror://xorg/individual/app/oclock-1.0.4.tar.bz2
mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2
mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2
@ -26,13 +25,13 @@ mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2
mirror://xorg/individual/app/transset-1.0.2.tar.bz2
mirror://xorg/individual/app/twm-1.0.10.tar.bz2
mirror://xorg/individual/app/viewres-1.0.5.tar.bz2
mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2
mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2
mirror://xorg/individual/app/xauth-1.0.10.tar.bz2
mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2
mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2
mirror://xorg/individual/app/xclock-1.0.8.tar.bz2
mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2
mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2
mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2
mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2
mirror://xorg/individual/app/xdm-1.1.12.tar.bz2
@ -40,6 +39,7 @@ mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2
mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2
mirror://xorg/individual/app/xev-1.2.3.tar.bz2
mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2
mirror://xorg/individual/app/xfd-1.1.3.tar.bz2
mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2
mirror://xorg/individual/app/xfs-1.2.0.tar.bz2
mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2
@ -60,8 +60,9 @@ mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2
mirror://xorg/individual/app/xmag-1.0.6.tar.bz2
mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2
mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2
mirror://xorg/individual/app/xmore-1.0.3.tar.bz2
mirror://xorg/individual/app/xpr-1.0.5.tar.bz2
mirror://xorg/individual/app/xprop-1.2.3.tar.bz2
mirror://xorg/individual/app/xprop-1.2.4.tar.bz2
mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2
mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2
mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2
@ -87,11 +88,11 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-apm-1.3.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-18.0.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-19.0.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2
@ -171,7 +172,7 @@ mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2
mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2
mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2
mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2
mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2
mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2
mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
@ -180,23 +181,23 @@ mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2
mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2
mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2
mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2
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/libXcomposite-0.4.5.tar.bz2
mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2
mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2
mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2
mirror://xorg/individual/lib/libXext-1.3.4.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
mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2
mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2
mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2
mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2
mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2
mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2
mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2
mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2
mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2
mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2
mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2
mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2
mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2
mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2
@ -204,16 +205,16 @@ mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2
mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2
mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2
mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2
mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2
mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2
mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2
mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2
mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2
mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2
mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2
mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2
mirror://xorg/individual/proto/xorgproto-2018.4.tar.bz2
mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2
mirror://xorg/individual/util/imake-1.0.7.tar.bz2
mirror://xorg/individual/util/imake-1.0.8.tar.bz2
mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2
mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2