MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 08:36:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xorg: fix update generation

Browse source 
Both e3d3bc66dc and 1d15641433 were done incorrectly.

Also, use python3 in generate-expr-from-tarballs.pl instead of overrides.nix.
This commit is contained in:
TredwellGit 2020-11-13 14:29:41 +00:00 committed by Jonathan Ringer
parent 46e30163ff
commit fc03fe100a
4 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1157,7 +1157,7 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) {}; }) {};
libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python }: stdenv.mkDerivation { libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation {
name = "libxcb-1.14"; name = "libxcb-1.14";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
@ -1165,7 +1165,7 @@ lib.makeScope newScope (self: with self; {
sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5"; sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5";
}; };
hardeningDisable = [ "bindnow" "relro" ]; hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig python ]; nativeBuildInputs = [ pkgconfig python3 ];
buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ]; buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) {}; }) {};
@ -1430,7 +1430,7 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) {}; }) {};
xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation { xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python3 }: stdenv.mkDerivation {
name = "xcb-proto-1.14.1"; name = "xcb-proto-1.14.1";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
@ -1438,7 +1438,7 @@ lib.makeScope newScope (self: with self; {
sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph"; sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph";
}; };
hardeningDisable = [ "bindnow" "relro" ]; hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig python ]; nativeBuildInputs = [ pkgconfig python3 ];
buildInputs = [ ]; buildInputs = [ ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) {}; }) {};
@ -1963,7 +1963,7 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) {}; }) {};
xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC, libXv }: stdenv.mkDerivation { xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation {
name = "xf86-video-intel-2.99.917"; name = "xf86-video-intel-2.99.917";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
@ -1972,7 +1972,7 @@ lib.makeScope newScope (self: with self; {
}; };
hardeningDisable = [ "bindnow" "relro" ]; hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC libXv ]; buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) {}; }) {};
@ -2522,7 +2522,7 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) {}; }) {};
xkeyboardconfig = callPackage ({ stdenv, python3, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation {
name = "xkeyboard-config-2.31"; name = "xkeyboard-config-2.31";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
@ -2532,9 +2532,6 @@ lib.makeScope newScope (self: with self; {
hardeningDisable = [ "bindnow" "relro" ]; hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig python3 ]; nativeBuildInputs = [ pkgconfig python3 ];
buildInputs = [ libX11 xorgproto ]; buildInputs = [ libX11 xorgproto ];
prePatch = ''
patchShebangs rules/merge.py
'';
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) {}; }) {};

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

@ -25,7 +25,7 @@ my %pcMap;
my %extraAttrs; my %extraAttrs;
my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext" ); my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python3", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext" );
$pcMap{$_} = $_ foreach @missingPCs; $pcMap{$_} = $_ foreach @missingPCs;
$pcMap{"freetype2"} = "freetype"; $pcMap{"freetype2"} = "freetype";
$pcMap{"libpng12"} = "libpng"; $pcMap{"libpng12"} = "libpng";
@ -161,7 +161,7 @@ while (<>) {
} }
if ($file =~ /AM_PATH_PYTHON/) { if ($file =~ /AM_PATH_PYTHON/) {
push @nativeRequires, "python"; push @nativeRequires, "python3";
} }
if ($file =~ /AC_PATH_PROG\(FCCACHE/) { if ($file =~ /AC_PATH_PROG\(FCCACHE/) {

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

@ -4,7 +4,7 @@
freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge,
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
mcpp, epoxy, openssl, pkgconfig, llvm_6, python3, libxslt, mcpp, epoxy, openssl, pkgconfig, llvm_6, libxslt,
ApplicationServices, Carbon, Cocoa, Xplugin ApplicationServices, Carbon, Cocoa, Xplugin
}: }:
@ -73,9 +73,7 @@ self: super:
mkfontdir = self.mkfontscale; mkfontdir = self.mkfontscale;
libxcb = (super.libxcb.override { libxcb = super.libxcb.overrideAttrs (attrs: {
python = python3;
}).overrideAttrs (attrs: {
configureFlags = [ "--enable-xkb" "--enable-xinput" ]; configureFlags = [ "--enable-xkb" "--enable-xinput" ];
outputs = [ "out" "dev" "man" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];
}); });
@ -332,10 +330,6 @@ self: super:
buildInputs = attrs.buildInputs ++ [ freetype fontconfig ]; buildInputs = attrs.buildInputs ++ [ freetype fontconfig ];
}); });
xcbproto = super.xcbproto.override {
python = python3;
};
xcbutil = super.xcbutil.overrideAttrs (attrs: { xcbutil = super.xcbutil.overrideAttrs (attrs: {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
}); });
@ -463,8 +457,8 @@ self: super:
}); });
xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: { xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: {
prePatch = "patchShebangs rules/merge.py";
nativeBuildInputs = attrs.nativeBuildInputs ++ [ intltool libxslt ]; nativeBuildInputs = attrs.nativeBuildInputs ++ [ intltool libxslt ];
configureFlags = [ "--with-xkb-rules-symlink=xorg" ]; configureFlags = [ "--with-xkb-rules-symlink=xorg" ];
# 1: compatibility for X11/xkb location # 1: compatibility for X11/xkb location
@ -790,7 +784,7 @@ self: super:
rev = "f66d39544bb8339130c96d282a80f87ca1606caf"; rev = "f66d39544bb8339130c96d282a80f87ca1606caf";
sha256 = "14rwbbn06l8qpx7s5crxghn80vgcx8jmfc7qvivh72d81r0kvywl"; sha256 = "14rwbbn06l8qpx7s5crxghn80vgcx8jmfc7qvivh72d81r0kvywl";
}; };
buildInputs = attrs.buildInputs ++ [self.libXfixes self.libXScrnSaver self.pixman]; buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman ];
nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros]; nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros];
configureFlags = [ "--with-default-dri=3" "--enable-tools" ]; configureFlags = [ "--with-default-dri=3" "--enable-tools" ];

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

@ -75,7 +75,7 @@ mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2
mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2
mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2
mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2 mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.31.tar.bz2
mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2