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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-01-07 13:06:41 +01:00
parent 9075da145a f19eb635b4
commit 0ea0dacc20
457 changed files with 8204 additions and 3941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/x11/xorg/default.nix
+6 -6
View File
@@ -2029,11 +2029,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xf86videonouveau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation {
name = "xf86-video-nouveau-1.0.15";
name = "xf86-video-nouveau-1.0.16";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2";
sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf";
url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.16.tar.bz2";
sha256 = "01mz8gnq7j6bvrqb2ljm3d1wpjhi9p2z2w8zbkdrqmqmcj060h1h";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -2289,11 +2289,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xf86videovesa = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation {
name = "xf86-video-vesa-2.4.0";
name = "xf86-video-vesa-2.5.0";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2";
sha256 = "1373vsxn6qh00na0s9c09kf09gj78rzi98zq93id8v5zsya3qi5z";
url = "mirror://xorg/individual/driver/xf86-video-vesa-2.5.0.tar.bz2";
sha256 = "0nf6ai74c60xk96kgr8q9mx6lrxm5id3765ws4d801irqzrj85hz";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
pkgs/servers/x11/xorg/overrides.nix
+24 -9
View File
@@ -69,7 +69,8 @@ self: super:
mkfontdir = self.mkfontscale;
libxcb = super.libxcb.overrideAttrs (attrs: {
configureFlags = [ "--enable-xkb" "--enable-xinput" ];
configureFlags = [ "--enable-xkb" "--enable-xinput" ]
++ stdenv.lib.optional stdenv.hostPlatform.isStatic "--disable-shared";
outputs = [ "out" "dev" "man" "doc" ];
});
@@ -77,15 +78,18 @@ self: super:
outputs = [ "out" "dev" "man" ];
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
depsBuildBuild = [ buildPackages.stdenv.cc ];
depsBuildBuild = [
buildPackages.stdenv.cc
] ++ stdenv.lib.optionals stdenv.hostPlatform.isStatic [
(self.buildPackages.stdenv.cc.libc.static or null)
];
preConfigure = ''
sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
'';
postInstall =
''
# Remove useless DocBook XML files.
rm -rf $out/share/doc
'';
postInstall = ''
# Remove useless DocBook XML files.
rm -rf $out/share/doc
'';
CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ];
});
@@ -133,6 +137,11 @@ self: super:
xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: {
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
preConfigure = attrs.preConfigure or ""
# missing transitive dependencies
+ stdenv.lib.optionalString stdenv.hostPlatform.isStatic ''
export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lXau -lXdmcp"
'';
});
# Propagate some build inputs because of header file dependencies.
@@ -218,8 +227,9 @@ self: super:
libXi = super.libXi.overrideAttrs (attrs: {
outputs = [ "out" "dev" "man" "doc" ];
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXfixes ];
configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"xorg_cv_malloc0_returns_null=no";
configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"xorg_cv_malloc0_returns_null=no"
] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic "--disable-shared";
});
libXinerama = super.libXinerama.overrideAttrs (attrs: {
@@ -740,6 +750,11 @@ self: super:
xauth = super.xauth.overrideAttrs (attrs: {
doCheck = false; # fails
preConfigure = attrs.preConfigure or ""
# missing transitive dependencies
+ stdenv.lib.optionalString stdenv.hostPlatform.isStatic ''
export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lxcb -lXau -lXdmcp"
'';
});
xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: {
pkgs/servers/x11/xorg/tarballs.list
+2 -2
View File
@@ -105,7 +105,7 @@ mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2
mirror://xorg/individual/driver/xf86-video-nouveau-1.0.16.tar.bz2
mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2
mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2
@@ -125,7 +125,7 @@ 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/individual/driver/xf86-video-v4l-0.3.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vesa-2.5.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2