diff options
| author | Lengyel Balazs <ikervagyok@gmail.com> | 2018-12-31 13:32:07 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-01-04 14:38:57 +0100 |
| commit | beaca82e4834b84c7ae219328da30c52a8cfe81f (patch) | |
| tree | cdfd0cd3f2e7bcdd96e008c92524e551ec1fafae /pkgs/servers | |
| parent | 4235b0a4475c60a4c7fc08bb1c0f4ad79a0dc814 (diff) | |
| download | nixlib-beaca82e4834b84c7ae219328da30c52a8cfe81f.tar nixlib-beaca82e4834b84c7ae219328da30c52a8cfe81f.tar.gz nixlib-beaca82e4834b84c7ae219328da30c52a8cfe81f.tar.bz2 nixlib-beaca82e4834b84c7ae219328da30c52a8cfe81f.tar.lz nixlib-beaca82e4834b84c7ae219328da30c52a8cfe81f.tar.xz nixlib-beaca82e4834b84c7ae219328da30c52a8cfe81f.tar.zst nixlib-beaca82e4834b84c7ae219328da30c52a8cfe81f.zip | |
xorg/mkfontscale: 1.1.2 -> 1.1.3
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 9 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 |
3 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2cfbfaa9f3df..7b0f29e0c01d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1184,11 +1184,11 @@ lib.makeScope newScope (self: with self; { }) {}; mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { - name = "mkfontscale-1.1.2"; + name = "mkfontscale-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2; - sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc"; + url = mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2; + sha256 = "0siag28jpm8hj62bgjvw81sjfgrc7vcy2h7127bl4iazxrlxz60y"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 9a3a3f1a1d51..29a7e39cdd95 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -75,15 +75,6 @@ self: super: 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: { configureFlags = [ "--enable-xkb" "--enable-xinput" ]; outputs = [ "out" "dev" "man" "doc" ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 3d6246f8f1f5..d16005a7a73e 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -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/bitmap-1.0.8.tar.gz 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/setxkbmap-1.3.1.tar.bz2 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 |