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

xorg/mkfontscale: 1.1.2 -> 1.1.3

Browse Source
This commit is contained in:
Lengyel Balazs 2018-12-31 13:32:07 +01:00 committed by Robin Gloster
parent 4235b0a447
commit beaca82e48
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1184,11 +1184,11 @@ lib.makeScope newScope (self: with self; {
}) {}; }) {};
mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation {
name = "mkfontscale-1.1.2"; name = "mkfontscale-1.1.3";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2; url = mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2;
sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc"; sha256 = "0siag28jpm8hj62bgjvw81sjfgrc7vcy2h7127bl4iazxrlxz60y";
}; };
hardeningDisable = [ "bindnow" "relro" ]; hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

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

@ -75,15 +75,6 @@ self: super:
preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${self.mkfontscale}/bin"; preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${self.mkfontscale}/bin";
}); });
mkfontscale = super.mkfontscale.overrideAttrs (attrs: {
patches = lib.singleton (fetchpatch {
name = "mkfontscale-fix-sig11.patch";
url = "https://bugs.freedesktop.org/attachment.cgi?id=113951";
sha256 = "0i2xf768mz8kvm7i514v0myna9m6jqw82f9a03idabdpamxvwnim";
});
patchFlags = [ "-p0" ];
});
libxcb = super.libxcb.overrideAttrs (attrs: { libxcb = super.libxcb.overrideAttrs (attrs: {
configureFlags = [ "--enable-xkb" "--enable-xinput" ]; configureFlags = [ "--enable-xkb" "--enable-xinput" ];
outputs = [ "out" "dev" "man" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];

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

@ -12,7 +12,7 @@ mirror://xorg/individual/app/appres-1.0.4.tar.bz2
mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2
mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/bitmap-1.0.8.tar.gz
mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2
mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2 mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2
mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2
mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2
mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2