diff options
| author | Will Dietz <w@wdtz.org> | 2019-03-21 06:50:18 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-03-21 06:50:18 -0500 |
| commit | c489789f61b4ace99778ac5e9d1113d9a7552148 (patch) | |
| tree | 405f27e2c23f4cdc66f30e8ee7290302c09d7a05 /pkgs/servers/x11/xorg | |
| parent | 84fb329ec1898d1e5386842212d5256b86903af6 (diff) | |
| download | nixlib-c489789f61b4ace99778ac5e9d1113d9a7552148.tar nixlib-c489789f61b4ace99778ac5e9d1113d9a7552148.tar.gz nixlib-c489789f61b4ace99778ac5e9d1113d9a7552148.tar.bz2 nixlib-c489789f61b4ace99778ac5e9d1113d9a7552148.tar.lz nixlib-c489789f61b4ace99778ac5e9d1113d9a7552148.tar.xz nixlib-c489789f61b4ace99778ac5e9d1113d9a7552148.tar.zst nixlib-c489789f61b4ace99778ac5e9d1113d9a7552148.zip | |
xorg.mkfontscale: 1.2.0 -> 1.2.1
https://lists.x.org/archives/xorg-announce/2019-March/002988.html
Diffstat (limited to 'pkgs/servers/x11/xorg')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2658e4009cdd..bdb7f2f57384 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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 ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 58b7c7f3e6dc..d0d4c339af47 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -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" ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 8608f8011202..5a5d87cd8045 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -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 |