diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-04-19 22:14:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-04-19 22:15:32 +0200 |
| commit | 5d850ba9d34c6d0097ca21f281c8b8fe38b918ba (patch) | |
| tree | cc800b1aa9e8cee6e9c26da2486b597904419683 /pkgs/servers/x11 | |
| parent | f66e5664e03025dd25280408a2c66a5ba6a7e5b5 (diff) | |
| download | nixlib-5d850ba9d34c6d0097ca21f281c8b8fe38b918ba.tar nixlib-5d850ba9d34c6d0097ca21f281c8b8fe38b918ba.tar.gz nixlib-5d850ba9d34c6d0097ca21f281c8b8fe38b918ba.tar.bz2 nixlib-5d850ba9d34c6d0097ca21f281c8b8fe38b918ba.tar.lz nixlib-5d850ba9d34c6d0097ca21f281c8b8fe38b918ba.tar.xz nixlib-5d850ba9d34c6d0097ca21f281c8b8fe38b918ba.tar.zst nixlib-5d850ba9d34c6d0097ca21f281c8b8fe38b918ba.zip | |
xorg: revert fontsproto update, as it breaks libXfont
This partially reverts commit 30ac332563318be4e445dc3335e803326df84d3c. https://groups.google.com/forum/#!msg/xorg-devel/SvgqiQnSN7c/f0wjRhauqvUJ It's sad that the currently *released* versions don't even compile together, and no dev reacts for four days so far...
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6708612a7cae..ad3e8fa8ac82 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -430,11 +430,11 @@ let })) // {inherit bdftopcf mkfontdir ;}; fontsproto = (stdenv.mkDerivation ((if overrides ? fontsproto then overrides.fontsproto else x: x) { - name = "fontsproto-2.1.3"; + name = "fontsproto-2.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2; - sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415"; + url = mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2; + sha256 = "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 12e3ee640421..6ae9725aa712 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -41,7 +41,7 @@ mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2 -mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 |