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

Merge pull request #6499 from avnik/xkbcomp-fix

Browse Source 
Proper default path for XKB config files
This commit is contained in:
Arseniy Seroka 2015-02-25 04:46:59 +03:00
commit ae8eb54c8b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/servers/x11/xorg/overrides.nix
View File

@ -241,7 +241,7 @@ in
}; };
xkbcomp = attrs: attrs // { xkbcomp = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\".\""; configureFlags = "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb";
}; };
xkeyboardconfig = attrs: attrs // { xkeyboardconfig = attrs: attrs // {

2
pkgs/top-level/perl-packages.nix
View File

@ -101,7 +101,7 @@ let self = _self // overrides; _self = with self; {
url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz";
sha256 = "0h4g7jl0p8a35kyvsji3qlb75mbcfqpvvmwh7s9krkbqklqjlxxl"; sha256 = "0h4g7jl0p8a35kyvsji3qlb75mbcfqpvvmwh7s9krkbqklqjlxxl";
}; };
propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ]; propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ModulePluggable ];
}; };
AnyEvent = buildPerlPackage { AnyEvent = buildPerlPackage {