diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-05-26 18:52:32 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-05-26 20:06:51 +0200 |
| commit | e5fa9ab0fd432f661ba1bbb13bee461ca95038b4 (patch) | |
| tree | 033d5c2f1abfbde7936e9fd0e14d504ba1817d00 /pkgs/servers/x11 | |
| parent | 688b4ca5dbec29f126632187f5f726d11e3f5f74 (diff) | |
| download | nixlib-e5fa9ab0fd432f661ba1bbb13bee461ca95038b4.tar nixlib-e5fa9ab0fd432f661ba1bbb13bee461ca95038b4.tar.gz nixlib-e5fa9ab0fd432f661ba1bbb13bee461ca95038b4.tar.bz2 nixlib-e5fa9ab0fd432f661ba1bbb13bee461ca95038b4.tar.lz nixlib-e5fa9ab0fd432f661ba1bbb13bee461ca95038b4.tar.xz nixlib-e5fa9ab0fd432f661ba1bbb13bee461ca95038b4.tar.zst nixlib-e5fa9ab0fd432f661ba1bbb13bee461ca95038b4.zip | |
xlsfonts: generate along with xorg stuff
Also a minor update. /cc maintainer @viric.
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d01caddd7109..f16bc23d76a7 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2004,6 +2004,16 @@ let buildInputs = [pkgconfig libxcb ]; }) // {inherit libxcb ;}; + xlsfonts = (mkDerivation "xlsfonts" { + name = "xlsfonts-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2; + sha256 = "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0"; + }; + buildInputs = [pkgconfig libX11 xproto ]; + }) // {inherit libX11 xproto ;}; + xmag = (mkDerivation "xmag" { name = "xmag-1.0.6"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 15568733cbec..5821390110e9 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -174,6 +174,7 @@ mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 +mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 |