ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-12 03:56:17 +03:00
Code Issues Projects Releases Wiki Activity

xorg: change generator "name" to "pname" & "version"

Browse Source
This commit is contained in:
Felix Buehler 2021-06-09 15:56:10 +02:00
parent 5baab3cd74
commit 6c48964a0d
3 changed files with 451 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -17,6 +17,7 @@ use File::Temp;
my %pkgURLs; my %pkgURLs;
my %pkgHashes; my %pkgHashes;
my %pkgNames; my %pkgNames;
my %pkgVersions;
my %pkgRequires; my %pkgRequires;
my %pkgNativeRequires; my %pkgNativeRequires;
@ -73,8 +74,12 @@ while (<>) {
next; next;
} }
# split by first occurence of hyphen followd by only numbers ends line or another hyphen follows
my ($name, $version) = split(/-(?=[.0-9]+(?:$|-))/, $pkgName, 2);
$pkgURLs{$pkg} = $tarball; $pkgURLs{$pkg} = $tarball;
$pkgNames{$pkg} = $pkgName; $pkgNames{$pkg} = $name;
$pkgVersions{$pkg} = $version;
my $cachePath = catdir($downloadCache, basename($tarball)); my $cachePath = catdir($downloadCache, basename($tarball));
my $hash; my $hash;
@ -302,7 +307,8 @@ foreach my $pkg (sort (keys %pkgURLs)) {
print OUT <<EOF print OUT <<EOF
$pkg = callPackage ({ $argumentsStr }: stdenv.mkDerivation { $pkg = callPackage ({ $argumentsStr }: stdenv.mkDerivation {
name = "$pkgNames{$pkg}"; pname = "$pkgNames{$pkg}";
version = "$pkgVersions{$pkg}";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = "$pkgURLs{$pkg}"; url = "$pkgURLs{$pkg}";

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

@ -664,7 +664,7 @@ self: super:
( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others
cd "$dev" cd "$dev"
for f in include/xorg/*.h; do for f in include/xorg/*.h; do
sed "1i#line 1 \"${attrs.name}/$f\"" -i "$f" sed "1i#line 1 \"${attrs.pname}-${attrs.version}/$f\"" -i "$f"
done done
) )
''; '';