diff options
author | Will Dietz <w@wdtz.org> | 2019-03-18 21:34:15 -0500 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2019-03-18 23:45:42 -0500 |
commit | 29f4526a5a67ea6c9a8f3f7b841ce536a4c0a038 (patch) | |
tree | 99a9c8b8c7319220ae37e8e585412e63578d43f6 /pkgs/servers/x11 | |
parent | 061f6562f0f284f423bc793eb48eec808e38ca3e (diff) | |
download | nixlib-29f4526a5a67ea6c9a8f3f7b841ce536a4c0a038.tar nixlib-29f4526a5a67ea6c9a8f3f7b841ce536a4c0a038.tar.gz nixlib-29f4526a5a67ea6c9a8f3f7b841ce536a4c0a038.tar.bz2 nixlib-29f4526a5a67ea6c9a8f3f7b841ce536a4c0a038.tar.lz nixlib-29f4526a5a67ea6c9a8f3f7b841ce536a4c0a038.tar.xz nixlib-29f4526a5a67ea6c9a8f3f7b841ce536a4c0a038.tar.zst nixlib-29f4526a5a67ea6c9a8f3f7b841ce536a4c0a038.zip |
xorg: detect deps on libxkbfile from ${XKBMODULE}
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 12 | ||||
-rwxr-xr-x | pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a050b7b80afa..9bf1674b87ca 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1248,7 +1248,7 @@ lib.makeScope newScope (self: with self; { 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"; builder = ./builder.sh; src = fetchurl { @@ -1257,7 +1257,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext libXmu libXt ]; + buildInputs = [ libxkbfile libX11 libXext libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2340,7 +2340,7 @@ lib.makeScope newScope (self: with self; { 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"; builder = ./builder.sh; src = fetchurl { @@ -2349,7 +2349,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; 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; }) {}; @@ -2860,7 +2860,7 @@ lib.makeScope newScope (self: with self; { 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"; builder = ./builder.sh; src = fetchurl { @@ -2869,7 +2869,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xorgproto ]; + buildInputs = [ libxkbfile libX11 xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 0edffb89ac3e..599a7843c2f4 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -40,6 +40,7 @@ $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "xorgproto"; $pcMap{"\$DRI3PROTO"} = "xorgproto"; $pcMap{"\$DRI2PROTO"} = "xorgproto"; +$pcMap{"\${XKBMODULE}"} = "libxkbfile"; my $downloadCache = "./download-cache"; |