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

* Produce the right name attribute.

Browse Source 
svn path=/nixpkgs/trunk/; revision=4520
This commit is contained in:
Eelco Dolstra 2006-01-08 21:19:56 +00:00
parent 20d0e31cd0
commit c45d0521bd
2 changed files with 299 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -10,6 +10,7 @@ my $baseURL = "http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything
my $tmpDir = "/tmp/xorg-unpack";
my $version = "X11R7"; # will be removed from package names
my $version2 = "X11R7.0"; # will be removed from package names
my %pkgURLs;
@ -46,9 +47,9 @@ while (<>) {
die unless defined $1;
my $pkg = $1;
$pkg =~ s/-//g;
print "$pkg\n";
$pkg =~ s/$version//g if $version ne "";
$pkgURLs{$pkg} = $tarball;
# print "$pkg\n";
my ($hash, $path) = `PRINT_PATH=1 QUIET=1 nix-prefetch-url '$tarball' $pkgHashes{$pkg}`;
chomp $hash;
@ -62,7 +63,7 @@ while (<>) {
$tarball =~ /\/([^\/]*)\.tar\.bz2$/;
my $pkgName = $1;
$pkgName =~ s/-$version//g if $version ne "";
$pkgName =~ s/-$version2//g if $version2 ne "";
$pkgNames{$pkg} = $pkgName;
print "\nunpacking $path\n";
@ -83,9 +84,14 @@ while (<>) {
my @requires = ();
my %requires = ();
open FOO, "cd '$tmpDir'/* && grep PKG_CHECK_MODULES configure.ac |";
open FOO, "cd '$tmpDir'/* && cat configure.ac |";
while (<FOO>) {
if (/PKG_CHECK_MODULES\([^,]*,\s*\[?([^\),\]]*)/) {
if (/PKG_CHECK_MODULES\([^,]*,\s*\[?([^\),\]]*)/ ||
/MODULES=\"(.*)\"/ ||
/REQUIRED_LIBS=\"(.*)\"/ ||
/REQUIRES=\"(.*)\"/)
{
print "MATCH: $_\n";
foreach my $req (split / /, $1) {
next if $req eq ">=";
next if $req =~ /^\$/;