diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-11 00:23:03 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-11 00:23:03 +0200 |
| commit | 4970574409ea15bcd769c4e999e8d272ae629b1b (patch) | |
| tree | d53877f04b3ad18dd6edfe3569fc14bc94a95b14 /pkgs/development/libraries/wayland/default.nix | |
| parent | 4a57b07653751be95636134aee91586c47aedb4c (diff) | |
| parent | d57ef6b523838cf161dbc9fb01173caf3e84954b (diff) | |
| download | nixpkgs-4970574409ea15bcd769c4e999e8d272ae629b1b.tar nixpkgs-4970574409ea15bcd769c4e999e8d272ae629b1b.tar.gz nixpkgs-4970574409ea15bcd769c4e999e8d272ae629b1b.tar.bz2 nixpkgs-4970574409ea15bcd769c4e999e8d272ae629b1b.tar.lz nixpkgs-4970574409ea15bcd769c4e999e8d272ae629b1b.tar.xz nixpkgs-4970574409ea15bcd769c4e999e8d272ae629b1b.tar.zst nixpkgs-4970574409ea15bcd769c4e999e8d272ae629b1b.zip | |
Merge remote-tracking branch 'origin/gcc-4.9' into staging
Conflicts: pkgs/development/libraries/wayland/default.nix
Diffstat (limited to 'pkgs/development/libraries/wayland/default.nix')
| -rw-r--r-- | pkgs/development/libraries/wayland/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 16d2298279b..11cf77668d7 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { sha256 = "173w0pqzk2m7hjlg15bymrx7ynxgq1ciadg03hzybxwnvfi4gsmx"; }; - configureFlags = "--with-scanner"; + configureFlags = "--with-scanner --disable-documentation"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libffi docbook_xsl doxygen graphviz libxslt xmlto expat ]; + buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat ]; meta = { description = "Reference implementation of the wayland protocol"; |