mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-20 04:31:52 +00:00
Merge pull request #172064 from Artturin/xorgstrictautogen
xorg/generate-expr-from-tarballs.pl: enable strictDeps
This commit is contained in:
Artturi
GitHub
commit
4e6cb9efd9
File diff suppressed because it is too large
Load diff
|
|
@ -190,6 +190,7 @@ while (<>) {
|
|||
}
|
||||
|
||||
if ($isFont) {
|
||||
push @requires, "fontutil";
|
||||
push @{$extraAttrs{$pkg}}, "configureFlags = [ \"--with-fontrootdir=\$(out)/lib/X11/fonts\" ];";
|
||||
}
|
||||
|
||||
|
|
@ -293,10 +294,22 @@ foreach my $pkg (sort (keys %pkgURLs)) {
|
|||
my $nativeBuildInputsStr = join "", map { $_ . " " } @nativeBuildInputs;
|
||||
my $buildInputsStr = join "", map { $_ . " " } @buildInputs;
|
||||
|
||||
sub uniq {
|
||||
my %seen;
|
||||
my @res = ();
|
||||
foreach my $s (@_) {
|
||||
if (!defined $seen{$s}) {
|
||||
$seen{$s} = 1;
|
||||
push @res, $s;
|
||||
}
|
||||
}
|
||||
return @res;
|
||||
}
|
||||
|
||||
my @arguments = @buildInputs;
|
||||
push @arguments, @nativeBuildInputs;
|
||||
unshift @arguments, "stdenv", "pkg-config", "fetchurl";
|
||||
my $argumentsStr = join ", ", @arguments;
|
||||
my $argumentsStr = join ", ", uniq @arguments;
|
||||
|
||||
my $extraAttrsStr = "";
|
||||
if (defined $extraAttrs{$pkg}) {
|
||||
|
|
@ -314,6 +327,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
|
|||
sha256 = "$pkgHashes{$pkg}";
|
||||
};
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ pkg-config $nativeBuildInputsStr];
|
||||
buildInputs = [ $buildInputsStr];$extraAttrsStr
|
||||
meta.platforms = lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ self: super:
|
|||
});
|
||||
|
||||
encodings = super.encodings.overrideAttrs (attrs: {
|
||||
buildInputs = attrs.buildInputs ++ [ self.mkfontscale ];
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ self.mkfontscale ];
|
||||
});
|
||||
|
||||
editres = super.editres.overrideAttrs (attrs: {
|
||||
|
|
@ -437,9 +437,6 @@ self: super:
|
|||
|
||||
xf86inputvoid = brokenOnDarwin super.xf86inputvoid; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputvoid.x86_64-darwin
|
||||
xf86videodummy = brokenOnDarwin super.xf86videodummy; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videodummy.x86_64-darwin
|
||||
xf86videosuncg6 = brokenOnDarwin super.xf86videosuncg6; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin
|
||||
xf86videosunffb = brokenOnDarwin super.xf86videosunffb; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin
|
||||
xf86videosunleo = brokenOnDarwin super.xf86videosunleo; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin
|
||||
|
||||
# Obsolete drivers that don't compile anymore.
|
||||
xf86videoark = super.xf86videoark.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
|
||||
|
|
@ -463,8 +460,8 @@ self: super:
|
|||
});
|
||||
|
||||
xf86videoati = super.xf86videoati.overrideAttrs (attrs: {
|
||||
NIX_CFLAGS_COMPILE = "-I${self.xorgserver.dev or self.xorgserver}/include/xorg";
|
||||
nativeBuildInputs = with self; attrs.nativeBuildInputs ++ [ autoreconfHook utilmacros ];
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ];
|
||||
buildInputs = attrs.buildInputs ++ [ self.utilmacros ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/e0511968d04b42abf11bc0ffb387f143582bc144.patch";
|
||||
|
|
@ -474,7 +471,117 @@ self: super:
|
|||
});
|
||||
|
||||
xf86videonouveau = super.xf86videonouveau.overrideAttrs (attrs: {
|
||||
nativeBuildInputs = with self; attrs.nativeBuildInputs ++ [ autoreconfHook utilmacros ];
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ];
|
||||
buildInputs = attrs.buildInputs ++ [ self.utilmacros ];
|
||||
});
|
||||
|
||||
xf86videoglint = super.xf86videoglint.overrideAttrs (attrs: {
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ];
|
||||
buildInputs = attrs.buildInputs ++ [ self.utilmacros ];
|
||||
# https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1
|
||||
meta = attrs.meta // { broken = true; };
|
||||
});
|
||||
|
||||
xf86videosuncg6 = super.xf86videosuncg6.overrideAttrs (attrs: {
|
||||
meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin
|
||||
# https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6/-/commit/14392504de04841fa2cbb5cdf8d9c9c7c4eb2ed8
|
||||
postPatch = ''
|
||||
patch -p1 <<EOF
|
||||
diff --git a/src/cg6.h b/src/cg6.h
|
||||
index 9f176e69dc1f6fc5e35ca20c30a4d3b4faf52623..d6bc19e8767c6aee9e7174a43cf1d71a9f35af32 100644
|
||||
--- a/src/cg6.h
|
||||
+++ b/src/cg6.h
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
-#include "xf86RamDac.h"
|
||||
+#include "xf86Cursor.h"
|
||||
#include <X11/Xmd.h>
|
||||
#include "gcstruct.h"
|
||||
#include "cg6_regs.h"
|
||||
EOF
|
||||
'';
|
||||
});
|
||||
|
||||
xf86videosunffb = super.xf86videosunffb.overrideAttrs (attrs: {
|
||||
meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin
|
||||
# https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb/-/commit/656dd83b489e7bdc72d6c1990025d20dea26dc22
|
||||
postPatch = ''
|
||||
patch -p1 <<EOF
|
||||
diff --git a/src/ffb.h b/src/ffb.h
|
||||
index 67a2d87afa607b6bea07e53f4be738c1ebb757ab..d87024033fb48a83c50c588866c90cd6eac0975c 100644
|
||||
--- a/src/ffb.h
|
||||
+++ b/src/ffb.h
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
-#include "xf86RamDac.h"
|
||||
+#include "xf86Cursor.h"
|
||||
#ifdef HAVE_XAA_H
|
||||
#include "xaa.h"
|
||||
#endif
|
||||
EOF
|
||||
'';
|
||||
});
|
||||
|
||||
xf86videosunleo = super.xf86videosunleo.overrideAttrs (attrs: {
|
||||
meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin
|
||||
# https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunleo/-/commit/f58ba53e6b6fe1b6e21d6aa3901a11e6130b95b0
|
||||
postPatch = ''
|
||||
patch -p1 <<EOF
|
||||
diff --git a/src/leo.h b/src/leo.h
|
||||
index a5bf41d34955d81b7ea14d4da6bc7f65191a3f98..c45c59b71be679333216d289d689a3c06c8dcbf7 100644
|
||||
--- a/src/leo.h
|
||||
+++ b/src/leo.h
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
-#include "xf86RamDac.h"
|
||||
+#include "xf86Cursor.h"
|
||||
#include <X11/Xmd.h>
|
||||
#include "gcstruct.h"
|
||||
#include "leo_regs.h"
|
||||
EOF
|
||||
'';
|
||||
});
|
||||
|
||||
xf86videotrident = super.xf86videotrident.overrideAttrs (attrs: {
|
||||
# https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/commit/07a5c4732f1c28ffcb873ee04500e3cb813c50b4
|
||||
postPatch = ''
|
||||
patch -p1 <<EOF
|
||||
diff --git a/src/trident.h b/src/trident.h
|
||||
index 5cadf52d3be13f03e94a8f443f1c8a04358296e8..c82de4c7debf3ee42e3b7965b738a6bd6ae9147d 100644
|
||||
--- a/src/trident.h
|
||||
+++ b/src/trident.h
|
||||
@@ -38,7 +38,6 @@
|
||||
#include "xaa.h"
|
||||
#endif
|
||||
#include "xf86fbman.h"
|
||||
-#include "xf86RamDac.h"
|
||||
#include "compiler.h"
|
||||
#include "vgaHW.h"
|
||||
#include "xf86i2c.h"
|
||||
@@ -103,7 +102,6 @@ typedef struct {
|
||||
int useEXA;
|
||||
int Chipset;
|
||||
int DACtype;
|
||||
- int RamDac;
|
||||
int ChipRev;
|
||||
int HwBpp;
|
||||
int BppShift;
|
||||
@@ -169,7 +167,6 @@ typedef struct {
|
||||
CARD32 BltScanDirection;
|
||||
CARD32 DrawFlag;
|
||||
CARD16 LinePattern;
|
||||
- RamDacRecPtr RamDacRec;
|
||||
int CursorOffset;
|
||||
xf86CursorInfoPtr CursorInfoRec;
|
||||
xf86Int10InfoPtr Int10;
|
||||
EOF
|
||||
'';
|
||||
});
|
||||
|
||||
xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: {
|
||||
|
|
@ -821,7 +928,8 @@ self: super:
|
|||
});
|
||||
|
||||
xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: {
|
||||
buildInputs = attrs.buildInputs ++ [ self.xcursorgen self.xorgproto ];
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ self.xcursorgen ];
|
||||
buildInputs = attrs.buildInputs ++ [ self.xorgproto ];
|
||||
configureFlags = [ "--with-cursordir=$(out)/share/icons" ];
|
||||
});
|
||||
|
||||
|
|
@ -867,8 +975,8 @@ self: super:
|
|||
rev = "31486f40f8e8f8923ca0799aea84b58799754564";
|
||||
sha256 = "sha256-nqT9VZDb2kAC72ot9UCdwEkM1uuP9NriJePulzrdZlM=";
|
||||
};
|
||||
buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman ];
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros];
|
||||
buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman self.utilmacros ];
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook ];
|
||||
configureFlags = [ "--with-default-dri=3" "--enable-tools" ];
|
||||
|
||||
meta = attrs.meta // {
|
||||
|
|
|
|||
Loading…
Reference in a new issue