MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xlsfonts: generate along with xorg stuff

Browse source 
Also a minor update.
/cc maintainer @viric.
This commit is contained in:
Vladimír Čunát 2015-05-26 18:52:32 +02:00
parent 688b4ca5db
commit e5fa9ab0fd
4 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/applications/misc/xlsfonts/default.nix
View file

@ -1,23 +0,0 @@
# This program used to come with xorg releases, but now I could only find it
# at http://www.x.org/releases/individual/.
# That is why this expression is not inside pkgs.xorg
{stdenv, fetchurl, libX11, pkgconfig}:
stdenv.mkDerivation rec {
name = "xlsfonts-1.0.4";
src = fetchurl {
url = "mirror://xorg/individual/app/${name}.tar.bz2";
sha256 = "1lhcx600z9v65nk93xaxfzi79bm4naynabb52gz1vy1bxj2r25r8";
};
buildInputs = [libX11 pkgconfig];
meta = {
homepage = http://www.x.org/;
description = "Lists the fonts available in the X server";
license = stdenv.lib.licenses.free;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}

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

@ -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;

1
pkgs/servers/x11/xorg/tarballs-7.7.list
View file

@ -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

2
pkgs/top-level/all-packages.nix
View file

@ -11049,7 +11049,7 @@ let
freepv = callPackage ../applications/graphics/freepv { };
xfontsel = callPackage ../applications/misc/xfontsel { };
xlsfonts = callPackage ../applications/misc/xlsfonts { };
inherit (xorg) xlsfonts;
freerdp = callPackage ../applications/networking/remote/freerdp {
ffmpeg = ffmpeg_1;