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

libxkbcommon: set X11 locale directory (close #16340)

Browse Source
This commit is contained in:
Marius Bakke 2016-06-19 15:15:33 +01:00 committed by Vladimír Čunát
parent 61b8d27b4c
commit 429fdbcd63
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/libxkbcommon/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }: { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libxkbcommon-0.6.1"; name = "libxkbcommon-0.6.1";
@ -12,9 +12,10 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ]; buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ];
configureFlags = '' configureFlags = [
--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb"
''; "--with-x-locale-root=${libX11.out}/share/X11/locale"
];
preBuild = stdenv.lib.optionalString stdenv.isDarwin '' preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's/,--version-script=.*$//' Makefile sed -i 's/,--version-script=.*$//' Makefile