diff options
| author | Carles Pagès <page@cubata.homelinux.net> | 2013-02-18 20:15:59 +0100 |
|---|---|---|
| committer | Carles Pagès <page@cubata.homelinux.net> | 2013-02-18 20:15:59 +0100 |
| commit | d32a973fc995d06a8e81cb0bf7127a301d6ad7ba (patch) | |
| tree | 0d5807b0e4f165028ab01afb3cc501c13ef0cfcb /pkgs/development/libraries/wayland | |
| parent | bd8428efa13764f3bf6ac7de538afa5f50023aa2 (diff) | |
| parent | bcbf9472ea1af1ccdd2485e97960ebe94dddd633 (diff) | |
| download | nixpkgs-d32a973fc995d06a8e81cb0bf7127a301d6ad7ba.tar nixpkgs-d32a973fc995d06a8e81cb0bf7127a301d6ad7ba.tar.gz nixpkgs-d32a973fc995d06a8e81cb0bf7127a301d6ad7ba.tar.bz2 nixpkgs-d32a973fc995d06a8e81cb0bf7127a301d6ad7ba.tar.lz nixpkgs-d32a973fc995d06a8e81cb0bf7127a301d6ad7ba.tar.xz nixpkgs-d32a973fc995d06a8e81cb0bf7127a301d6ad7ba.tar.zst nixpkgs-d32a973fc995d06a8e81cb0bf7127a301d6ad7ba.zip | |
Merge remote-tracking branch 'upstream/x-updates' into wayland
Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/wayland/default.nix
Diffstat (limited to 'pkgs/development/libraries/wayland')
| -rw-r--r-- | pkgs/development/libraries/wayland/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 9b547df9469..8854a41210b 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libffi, expat, doxygen }: +{ stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }: let version = "1.0.5"; in @@ -10,11 +10,12 @@ stdenv.mkDerivation rec { sha256 = "130n7v5i7rfsrli2n8vdzfychlgd8v7by7sfgp8vfqdlss5km34w"; }; - buildInputs = [ pkgconfig libffi expat doxygen ]; + buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ]; meta = { description = "Reference implementation of the wayland protocol"; homepage = http://wayland.freedesktop.org/; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; }; } |