libXrender, libXvMC: Update

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

@@ -65,8 +65,8 @@ while (<>) {
     print "  $pkg $pkgName\n";
 
     if (defined $pkgNames{$pkg}) {
-	print "  SKIPPING\n";
-	next;
+        print "  SKIPPING\n";
+        next;
     }
 
     $pkgURLs{$pkg} = $tarball;
@@ -90,7 +90,7 @@ while (<>) {
     my $provides = `find $pkgDir -name "*.pc.in"`;
     my @provides2 = split '\n', $provides;
     my @requires = ();
-    
+
     foreach my $pcFile (@provides2) {
         my $pc = $pcFile;
         $pc =~ s/.*\///;
@@ -111,7 +111,7 @@ while (<>) {
             }
         }
         close FOO;
-        
+
     }
 
     my $file;
@@ -129,7 +129,7 @@ while (<>) {
     if ($file =~ /zlib is required/ || $file =~ /AC_CHECK_LIB\(z\,/) {
         push @requires, "zlib";
     }
-    
+
     if ($file =~ /Perl is required/) {
         push @requires, "perl";
     }
@@ -151,9 +151,9 @@ while (<>) {
     }
 
     if ($file =~ /AC_PATH_PROG\(FCCACHE/) {
-	# Don't run fc-cache.
-	die if defined $extraAttrs{$pkg};
-	$extraAttrs{$pkg} = " preInstall = \"installFlags=(FCCACHE=true)\"; ";
+        # Don't run fc-cache.
+        die if defined $extraAttrs{$pkg};
+        $extraAttrs{$pkg} = " preInstall = \"installFlags=(FCCACHE=true)\"; ";
     }
 
     my $isFont;
@@ -179,10 +179,10 @@ while (<>) {
 
     sub process {
         my $requires = shift;
-	my $s = shift;
-	$s =~ s/\[/\ /g;
-	$s =~ s/\]/\ /g;
-	$s =~ s/\,/\ /g;
+        my $s = shift;
+        $s =~ s/\[/\ /g;
+        $s =~ s/\]/\ /g;
+        $s =~ s/\,/\ /g;
         foreach my $req (split / /, $s) {
             next if $req eq ">=";
             #next if $req =~ /^\$/;
@@ -211,7 +211,7 @@ while (<>) {
 
     push @requires, "libxslt" if $pkg =~ /libxcb/;
     push @requires, "gperf", "m4", "xproto" if $pkg =~ /xcbutil/;
-    
+
     print "REQUIRES $pkg => @requires\n";
     $pkgRequires{$pkg} = \@requires;
 
@@ -234,6 +234,8 @@ let
 
   xorg = rec {
 
+  inherit pixman;
+
 EOF
 
 
@@ -257,7 +259,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
 
     my $extraAttrs = $extraAttrs{"$pkg"};
     $extraAttrs = "" unless defined $extraAttrs;
-    
+
     print OUT <<EOF
   $pkg = (stdenv.mkDerivation ((if overrides ? $pkg then overrides.$pkg else x: x) {
     name = "$pkgNames{$pkg}";
@@ -268,7 +270,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
     };
     buildInputs = [pkgconfig $inputs];$extraAttrs
   })) // {inherit $inputs;};
-    
+
 EOF
 }
 

pkgs/servers/x11/xorg/overrides.nix

@@ -1,10 +1,11 @@
-{args, xorg}:
+{ args, xorg }:
+
 let
-   setMalloc0ReturnsNullCrossCompiling = ''
-      if test -n "$crossConfig"; then
-        configureFlags="$configureFlags --enable-malloc0returnsnull";
-      fi
-    '';
+  setMalloc0ReturnsNullCrossCompiling = ''
+    if test -n "$crossConfig"; then
+      configureFlags="$configureFlags --enable-malloc0returnsnull";
+    fi
+  '';
 
   gitRelease = { libName, version, rev, sha256 } : attrs : attrs // {
     name = libName + "-" + version;
@@ -116,19 +117,11 @@ in
     sha256 = "01wx8fgjjfqm0sm9anj6rmz72yvjyb4y3ifjk2q4ixd7pdp63bx6";
   };
 
-  libXrender = compose (gitRelease {
-    libName = "libXrender";
-    version = "0.9.7.91";
-    rev = "786f78fd8df6d165ccbc81f306fd9f22b5c1551c";
-    sha256 = "157ljyhkxqk2xgizrq8pmpl75szb5j89gvvhkxsi0lys1wnbrxi4";
-  }) (attrs: attrs // { preConfigure = setMalloc0ReturnsNullCrossCompiling; });
+  libXrender = attrs: attrs
+    // { preConfigure = setMalloc0ReturnsNullCrossCompiling; };
 
-  libXvMC = compose (gitRelease {
-    libName = "libXvMC";
-    version = "1.0.7.91";
-    rev = "8c164524d229adb6141fdac8336b3823e7fe1a5d";
-    sha256 = "157ljyhkxqk2xgizrq8pmpl75szb5j89gvvhkxsi0lys1wnbrxi4";
-  }) (attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.renderproto]; });
+  libXvMC = attrs: attrs
+    // { buildInputs = attrs.buildInputs ++ [xorg.renderproto]; };
 
   libXpm = attrs: attrs // {
     patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";

pkgs/servers/x11/xorg/tarballs-7.7.list

@@ -73,13 +73,13 @@ mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXpm-3.5.10.tar.bz2
 mirror://xorg/individual/lib/libXrandr-1.4.1.tar.bz2
-mirror://xorg/individual/lib/libXrender-0.9.7.tar.bz2
+mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2
 mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2
 mirror://xorg/individual/lib/libXt-1.1.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2
 mirror://xorg/individual/lib/libXv-1.0.8.tar.bz2
-mirror://xorg/individual/lib/libXvMC-1.0.7.tar.bz2
+mirror://xorg/individual/lib/libXvMC-1.0.8.tar.bz2
 mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2
 mirror://xorg/individual/lib/libXxf86vm-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2

pkgs/top-level/all-packages.nix

@@ -4090,11 +4090,13 @@ let
   atkmm = callPackage ../development/libraries/atkmm { };
 
   cairo = callPackage ../development/libraries/cairo {
-    pixman = pixman_cairo; # it's recommended to be in sync
     glSupport = lib.elem system lib.platforms.mesaPlatforms;
   };
-  pixman_cairo = callPackage ../development/libraries/pixman { };
+
+  pixman = callPackage ../development/libraries/pixman { };
+
   cairomm = callPackage ../development/libraries/cairomm { };
+
   cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { };
 
   pango = callPackage ../development/libraries/pango { };
@@ -4104,12 +4106,14 @@ let
 
   gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
 
-  gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { 
+  gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
     cupsSupport = config.gtk2.cups or true;
   };
+
   gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix {
     inherit (gnome3) at_spi2_atk;
   });
+
   gtk = pkgs.gtk2;
 
   gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { };
@@ -5851,9 +5855,8 @@ let
     inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa_drivers
       xkeyboard_config dbus libuuid openssl gperf m4
-      autoconf libtool xmlto asciidoc udev flex bison python mtdev;
+      autoconf libtool xmlto asciidoc udev flex bison python mtdev pixman;
     automake = automake110x;
-    pixman = pixman_cairo;
     mesa = mesa_noglu;
   });