diff options
| author | Lengyel Balazs <ikervagyok@gmail.com> | 2018-12-31 14:02:10 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-01-04 14:38:57 +0100 |
| commit | f659a6625a5b213e5199a7fe0884290f286c105c (patch) | |
| tree | d250fa023e65efa6816f6fdb623a08f77d2a105d /pkgs/servers | |
| parent | 563dbdca4a0ba384e0fc18f94867d82d9d463982 (diff) | |
| download | nixlib-f659a6625a5b213e5199a7fe0884290f286c105c.tar nixlib-f659a6625a5b213e5199a7fe0884290f286c105c.tar.gz nixlib-f659a6625a5b213e5199a7fe0884290f286c105c.tar.bz2 nixlib-f659a6625a5b213e5199a7fe0884290f286c105c.tar.lz nixlib-f659a6625a5b213e5199a7fe0884290f286c105c.tar.xz nixlib-f659a6625a5b213e5199a7fe0884290f286c105c.tar.zst nixlib-f659a6625a5b213e5199a7fe0884290f286c105c.zip | |
xorg/xfs: 1.1.4 -> 1.2.0
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 33e08e6a4736..c0ffbcd55592 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2197,16 +2197,16 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont, xorgproto, xtrans }: stdenv.mkDerivation { - name = "xfs-1.1.4"; + xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { + name = "xfs-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfs-1.1.4.tar.bz2; - sha256 = "1ylz4r7adf567rnlbb52yi9x3qi4pyv954kkhm7ld4f0fkk7a2x4"; + url = mirror://xorg/individual/app/xfs-1.2.0.tar.bz2; + sha256 = "0q4q4rbzx159sfn2n52y039fki6nc6a39qdfxa78yjc3aw8i48nv"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libXfont xorgproto xtrans ]; + buildInputs = [ libXfont2 xorgproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 7a86316e9e40..1e992ad7be24 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -31,7 +31,7 @@ mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2 mirror://xorg/individual/app/xev-1.2.2.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2 -mirror://xorg/individual/app/xfs-1.1.4.tar.bz2 +mirror://xorg/individual/app/xfs-1.2.0.tar.bz2 mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.7.tar.bz2 |