public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xorg.mkfontscale: 1.2.0 -> 1.2.1 

https://lists.x.org/archives/xorg-announce/2019-March/002988.html
This commit is contained in:
Will Dietz 2019-03-21 06:50:18 -05:00
parent 84fb329ec1
commit c489789f61
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/x11/xorg/default.nix
View File

@ -1236,11 +1236,11 @@ lib.makeScope newScope (self: with self; {
}) {};
mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation {
name = "mkfontscale-1.2.0";
name = "mkfontscale-1.2.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/app/mkfontscale-1.2.0.tar.bz2;
sha256 = "1gn423m0v1w98df7ni74zrj2rkhsapnqfzr8139l638kkyz7far8";
url = mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2;
sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];

4
pkgs/servers/x11/xorg/overrides.nix
View File

@ -73,10 +73,6 @@ self: super:
mkfontdir = self.mkfontscale;
mkfontscale = super.mkfontscale.overrideAttrs (attrs: {
preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${placeholder "out"}/bin";
});
libxcb = super.libxcb.overrideAttrs (attrs: {
configureFlags = [ "--enable-xkb" "--enable-xinput" ];
outputs = [ "out" "dev" "man" "doc" ];

2
pkgs/servers/x11/xorg/tarballs.list
View File

@ -17,7 +17,7 @@ mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2
mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2
mirror://xorg/individual/app/ico-1.0.5.tar.bz2
mirror://xorg/individual/app/listres-1.0.4.tar.bz2
mirror://xorg/individual/app/mkfontscale-1.2.0.tar.bz2
mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2
mirror://xorg/individual/app/oclock-1.0.4.tar.bz2
mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2
mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2