diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2010-11-16 21:05:54 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2010-11-16 21:05:54 +0000 |
commit | e59ddf7bcb51f8d37d37900742fd73435cdcee0f (patch) | |
tree | 89f9e0985f3b331cc2418bbf0158d7d0e0b4ba1d /pkgs/servers/x11/xorg/default.nix | |
parent | d3d18bca232f60ffafa14706c4f3869c1e7a4bb8 (diff) | |
download | nixpkgs-e59ddf7bcb51f8d37d37900742fd73435cdcee0f.tar nixpkgs-e59ddf7bcb51f8d37d37900742fd73435cdcee0f.tar.gz nixpkgs-e59ddf7bcb51f8d37d37900742fd73435cdcee0f.tar.bz2 nixpkgs-e59ddf7bcb51f8d37d37900742fd73435cdcee0f.tar.lz nixpkgs-e59ddf7bcb51f8d37d37900742fd73435cdcee0f.tar.xz nixpkgs-e59ddf7bcb51f8d37d37900742fd73435cdcee0f.tar.zst nixpkgs-e59ddf7bcb51f8d37d37900742fd73435cdcee0f.zip |
Update Cairo, Pixman; update FF4beta - still broken, cannot pass fresh cairo correctly to it yet
svn path=/nixpkgs/trunk/; revision=24714
Diffstat (limited to 'pkgs/servers/x11/xorg/default.nix')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 14be8c440a1..a19cb8ee57d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -967,6 +967,16 @@ let buildInputs = [pkgconfig perl ]; })) // {inherit perl ;}; + pixman_0_20_0 = (stdenv.mkDerivation ((if overrides ? pixman then overrides.pixman else x: x) { + name = "pixman-0.20.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/lib/pixman-0.20.0.tar.bz2; + sha256 = "1dc804v98222n5awx1x1inwwdp6p7yksiw5yr8jip2pk3fbak627"; + }; + buildInputs = [pkgconfig perl ]; + })) // {inherit perl ;}; + printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) { name = "printproto-1.0.4"; builder = ./builder.sh; |