diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-21 19:43:53 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-21 19:43:53 +0200 |
| commit | ad47d658d1734353df834a05e45b98dae968550d (patch) | |
| tree | 5ee2481126f5e29cf961e3b955b748609bc08f82 /pkgs/development/libraries/wayland | |
| parent | 8213ff161c461655aaff7d43984384dbca64b312 (diff) | |
| parent | cc218fc91530529b84307faf6fa2dd8c5d395d6f (diff) | |
| download | nixpkgs-ad47d658d1734353df834a05e45b98dae968550d.tar nixpkgs-ad47d658d1734353df834a05e45b98dae968550d.tar.gz nixpkgs-ad47d658d1734353df834a05e45b98dae968550d.tar.bz2 nixpkgs-ad47d658d1734353df834a05e45b98dae968550d.tar.lz nixpkgs-ad47d658d1734353df834a05e45b98dae968550d.tar.xz nixpkgs-ad47d658d1734353df834a05e45b98dae968550d.tar.zst nixpkgs-ad47d658d1734353df834a05e45b98dae968550d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/wayland')
| -rw-r--r-- | pkgs/development/libraries/wayland/1.9.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/wayland/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index d832becbed8..3555a923228 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig -, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2 +, libffi, libxml2 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) }: diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index bbc33f33e70..fce0dae6c73 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig -, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2 +, libffi, libxml2 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) }: |