diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-07-18 23:28:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-07-18 23:28:57 +0200 |
| commit | 65a1b179f3786a8ed00d8985bb5a3dccc1d73aa8 (patch) | |
| tree | da8f5a810049bf4d94cd24a88d5bc9e1bd3c45a8 | |
| parent | 9b13b95570d71cd29bc62c928bedfd92bde23f37 (diff) | |
| parent | 95fadbc06d33977fc402b5df99ea274bace5dc1b (diff) | |
| download | nixpkgs-65a1b179f3786a8ed00d8985bb5a3dccc1d73aa8.tar nixpkgs-65a1b179f3786a8ed00d8985bb5a3dccc1d73aa8.tar.gz nixpkgs-65a1b179f3786a8ed00d8985bb5a3dccc1d73aa8.tar.bz2 nixpkgs-65a1b179f3786a8ed00d8985bb5a3dccc1d73aa8.tar.lz nixpkgs-65a1b179f3786a8ed00d8985bb5a3dccc1d73aa8.tar.xz nixpkgs-65a1b179f3786a8ed00d8985bb5a3dccc1d73aa8.tar.zst nixpkgs-65a1b179f3786a8ed00d8985bb5a3dccc1d73aa8.zip | |
Merge #65010: libxkbcommon: fix build on darwin
| -rw-r--r-- | pkgs/development/libraries/libxkbcommon/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 9b43c449e9a..ec4c904795f 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { "-Dx-locale-root=${libX11.out}/share/X11/locale" ]; + # Remove example program which fail on Darwin + postPatch = if stdenv.isDarwin then '' + substituteInPlace meson.build \ + --replace "executable('rmlvo-to-keymap', 'test/rmlvo-to-keymap.c', dependencies: test_dep)" "" + '' else null; + doCheck = false; # fails, needs unicode locale meta = with stdenv.lib; { |