ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 13:48:21 +03:00
Code Issues Projects Releases Wiki Activity

xorg: detect deps on libxkbfile from ${XKBMODULE}

Browse Source
This commit is contained in:
Will Dietz 2019-03-18 21:34:15 -05:00
parent 061f6562f0
commit 29f4526a5a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1248,7 +1248,7 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) {}; }) {};
oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation {
name = "oclock-1.0.4"; name = "oclock-1.0.4";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
@ -1257,7 +1257,7 @@ lib.makeScope newScope (self: with self; {
}; };
hardeningDisable = [ "bindnow" "relro" ]; hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 libXext libXmu libXt ]; buildInputs = [ libxkbfile libX11 libXext libXmu libXt ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) {}; }) {};
@ -2340,7 +2340,7 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) {}; }) {};
xfd = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { xfd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation {
name = "xfd-1.1.3"; name = "xfd-1.1.3";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
@ -2349,7 +2349,7 @@ lib.makeScope newScope (self: with self; {
}; };
hardeningDisable = [ "bindnow" "relro" ]; hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) {}; }) {};
@ -2860,7 +2860,7 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) {}; }) {};
xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation {
name = "xwd-1.0.7"; name = "xwd-1.0.7";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
@ -2869,7 +2869,7 @@ lib.makeScope newScope (self: with self; {
}; };
hardeningDisable = [ "bindnow" "relro" ]; hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 xorgproto ]; buildInputs = [ libxkbfile libX11 xorgproto ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) {}; }) {};

1
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View File

@ -40,6 +40,7 @@ $pcMap{"\$PIXMAN"} = "pixman";
$pcMap{"\$RENDERPROTO"} = "xorgproto"; $pcMap{"\$RENDERPROTO"} = "xorgproto";
$pcMap{"\$DRI3PROTO"} = "xorgproto"; $pcMap{"\$DRI3PROTO"} = "xorgproto";
$pcMap{"\$DRI2PROTO"} = "xorgproto"; $pcMap{"\$DRI2PROTO"} = "xorgproto";
$pcMap{"\${XKBMODULE}"} = "libxkbfile";
my $downloadCache = "./download-cache"; my $downloadCache = "./download-cache";