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

Merge pull request #65806 from JohnAZoidberg/fix-xtrap

Browse Source 
xorg.libXTrap: init at 1.0.1 (Fix build of xorg.xtrap)
This commit is contained in:
worldofpeace 2019-08-04 04:40:08 -04:00 committed by GitHub
commit 972ae117c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/servers/x11/xorg/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
download-cache/

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

@ -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;
}) {};

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

@ -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