diff options
author | Daniel Schaefer <git@danielschaefer.me> | 2019-08-02 18:49:45 +0200 |
---|---|---|
committer | Daniel Schaefer <git@danielschaefer.me> | 2019-08-02 18:49:45 +0200 |
commit | e3329f9e85b80c2defadf0669dabdd011dfa72ab (patch) | |
tree | 33f132e0696f4b848e594d881f2ab89df0b42bde /pkgs/servers/x11/xorg | |
parent | c2466ced95318d8cbeaf6efe972f7c296a98c4e6 (diff) | |
download | nixlib-e3329f9e85b80c2defadf0669dabdd011dfa72ab.tar nixlib-e3329f9e85b80c2defadf0669dabdd011dfa72ab.tar.gz nixlib-e3329f9e85b80c2defadf0669dabdd011dfa72ab.tar.bz2 nixlib-e3329f9e85b80c2defadf0669dabdd011dfa72ab.tar.lz nixlib-e3329f9e85b80c2defadf0669dabdd011dfa72ab.tar.xz nixlib-e3329f9e85b80c2defadf0669dabdd011dfa72ab.tar.zst nixlib-e3329f9e85b80c2defadf0669dabdd011dfa72ab.zip |
xorg.libXTrap: init at 1.0.1
Fixes build of xorg.xtrap
Diffstat (limited to 'pkgs/servers/x11/xorg')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 17 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 1 |
2 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a5869b21c581..3be672c29f17 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -728,6 +728,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + libXTrap = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { + name = "libXTrap-1.0.1"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2; + sha256 = "0bi5wxj6avim61yidh9fd3j4n8czxias5m8vss9vhxjnk1aksdwg"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorgproto libX11 libXext libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { name = "libXau-1.0.9"; builder = ./builder.sh; @@ -2834,7 +2847,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xtrap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXt }: stdenv.mkDerivation { + xtrap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { name = "xtrap-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -2843,7 +2856,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXt ]; + buildInputs = [ libX11 libXt libXTrap ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 26c2721e2407..426b848a138d 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -202,6 +202,7 @@ mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2 mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2 mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2 +mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2 |