BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #30837 from rnhmjoj/bitmap

Browse source 
xorg.bitmap: init at 1.0.8
This commit is contained in:
Orivej Desh 2017-11-29 08:15:23 +00:00 committed by GitHub
commit 31a96a3b44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,6 +67,18 @@ let
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit ;};
bitmap = (mkDerivation "bitmap" {
name = "bitmap-1.0.8";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/app/bitmap-1.0.8.tar.gz;
sha256 = "1z06a1sn3iq72rmh73f11xgb7n46bdav1fvpgczxjp6al88bsbqs";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 libXaw xbitmaps libXmu xproto libXt ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit libX11 libXaw xbitmaps libXmu xproto libXt ;};
compositeproto = (mkDerivation "compositeproto" {
name = "compositeproto-0.4.2";
builder = ./builder.sh;

15
pkgs/servers/x11/xorg/overrides.nix
View file

@ -24,6 +24,21 @@ let
compose = f: g: x: f (g x);
in
{
bitmap = attrs: attrs // {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ makeWrapper ];
postInstall = ''
paths=(
"$out/share/X11/%T/%N"
"$out/include/X11/%T/%N"
"${xorg.xbitmaps}/include/X11/%T/%N"
)
wrapProgram "$out/bin/bitmap" \
--suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}")
makeWrapper "$out/bin/bitmap" "$out/bin/bitmap-color" \
--suffix XFILESEARCHPATH : "$out/share/X11/%T/%N-color"
'';
};
encodings = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ];
};

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

@ -1,6 +1,7 @@
mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2
mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2
mirror://xorg/individual/app/bitmap-1.0.8.tar.gz
mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2