alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

xorg: go back to using the new nix syntax

Browse source 
This reverts commit 86a372683a.
The original revert was just temporary.

Conflicts (auto-solved):
	pkgs/servers/x11/xorg/default.nix
This commit is contained in:
Vladimír Čunát 2014-08-31 12:20:34 +02:00
parent 381dcb1d98
commit 4c3e6a4675
2 changed files with 449 additions and 424 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because it is too large Load diff

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

@ -230,6 +230,11 @@ args: with args;
let let
mkDerivation = name: attrs:
let newAttrs = (overrides."\${name}" or (x: x)) attrs;
stdenv = newAttrs.stdenv or args.stdenv;
in stdenv.mkDerivation (removeAttrs newAttrs [ "stdenv" ]);
overrides = import ./overrides.nix {inherit args xorg;}; overrides = import ./overrides.nix {inherit args xorg;};
xorg = rec { xorg = rec {
@ -261,7 +266,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
$extraAttrs = "" unless defined $extraAttrs; $extraAttrs = "" unless defined $extraAttrs;
print OUT <<EOF print OUT <<EOF
$pkg = (stdenv.mkDerivation ((if overrides ? $pkg then overrides.$pkg else x: x) { $pkg = (mkDerivation "$pkg" {
name = "$pkgNames{$pkg}"; name = "$pkgNames{$pkg}";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
@ -269,7 +274,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
sha256 = "$pkgHashes{$pkg}"; sha256 = "$pkgHashes{$pkg}";
}; };
buildInputs = [pkgconfig $inputs];$extraAttrs buildInputs = [pkgconfig $inputs];$extraAttrs
})) // {inherit $inputs;}; }) // {inherit $inputs;};
EOF EOF
} }