From a1ca3dbd085615989a7b6e3f9699b59ed01fbe10 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Tue, 24 Feb 2015 21:36:01 +0200 Subject: [PATCH 1/2] Fix build for perl-Alien-Wx and friends This should fix at least one problem, preventing build master on Travis-CI. --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e996d35b80e..2b3afb09412 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -101,7 +101,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; sha256 = "0h4g7jl0p8a35kyvsji3qlb75mbcfqpvvmwh7s9krkbqklqjlxxl"; }; - propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ]; + propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ModulePluggable ]; }; AnyEvent = buildPerlPackage { From 279d5af11908c39f426bc9151a56ac2d053f29a0 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 21 Feb 2015 18:23:16 +0200 Subject: [PATCH 2/2] Proper default path for XKB config files --- pkgs/servers/x11/xorg/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c91f0c32c3c..3701bdc461f 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -241,7 +241,7 @@ in }; xkbcomp = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\".\""; + configureFlags = "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb"; }; xkeyboardconfig = attrs: attrs // {