git.iko.soy/typeable/nixpkgs
on master help sign in
gtk-layer-shell: clean up

* Use `pkg-config` instead of the alias. * `gobject-introspection` is used during build for GIR generation, move it to `nativeBuildInputs`. * Remove unused `out` meson flag. * Enable docs. * Split to multiple outputs.

commit6164ca0b39384cf853a451de3644ee623e14ab28 authorJan Tojnar <jtojnar@gmail.com> dateMon 10 Aug 2020, 16:44 (6 years ago) parent7474d17
1 file changed+16−4
pkgs/development/libraries/gtk-layer-shell/default.nix+16−4
pkgs/development/libraries/gtk-layer-shell/default.nix+16−4
@@ -2,7 +2,10 @@
22, fetchFromGitHub
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
6+, gtk-doc
7+, docbook-xsl-nons
8+, docbook_xml_dtd_43
69, wayland
710, gtk3
811, gobject-introspection
@@ -12,6 +15,8 @@ stdenv.mkDerivation rec {
1215 pname = "gtk-layer-shell";
1316 version = "0.2.0";
1417
18+ outputs = [ "out" "dev" "devdoc" ];
19+
1520 src = fetchFromGitHub {
1621 owner = "wmww";
1722 repo = "gtk-layer-shell";
@@ -20,15 +25,22 @@ stdenv.mkDerivation rec {
2025 };
2126
2227 nativeBuildInputs = [
23− meson ninja pkgconfig
28+ meson
29+ ninja
30+ pkg-config
31+ gobject-introspection
32+ gtk-doc
33+ docbook-xsl-nons
34+ docbook_xml_dtd_43
2435 ];
2536
2637 buildInputs = [
27− wayland gtk3 gobject-introspection
38+ wayland
39+ gtk3
2840 ];
2941
3042 mesonFlags = [
31− "-Dout=${placeholder "out"}"
43+ "-Ddocs=true"
3244 ];
3345
3446 meta = with stdenv.lib; {