From 7474d171699c1afc57fa0819578ef854134072f6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 10 Aug 2020 16:36:50 +0200 Subject: [PATCH 1/2] gtk-layer-shell: 0.1.0 -> 0.2.0 License changed --- pkgs/development/libraries/gtk-layer-shell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index c00e8035f18b..892e1392a4bd 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "1fwvlbwp5w1zly6mksvlzbx18ikq4bh7pdj9q0k94qlj6x2zdwg8"; + sha256 = "0kas84z44p3vz92sljbnahh43wfj69knqsy1za729j8phrlwqdmg"; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; - license = licenses.mit; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ eonpatapon ]; platforms = platforms.unix; }; From 6164ca0b39384cf853a451de3644ee623e14ab28 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 10 Aug 2020 16:44:08 +0200 Subject: [PATCH 2/2] 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. --- .../libraries/gtk-layer-shell/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 892e1392a4bd..14f822432ee3 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -2,7 +2,10 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 , wayland , gtk3 , gobject-introspection @@ -12,6 +15,8 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; version = "0.2.0"; + outputs = [ "out" "dev" "devdoc" ]; + src = fetchFromGitHub { owner = "wmww"; repo = "gtk-layer-shell"; @@ -20,15 +25,22 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig + meson + ninja + pkg-config + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 ]; buildInputs = [ - wayland gtk3 gobject-introspection + wayland + gtk3 ]; mesonFlags = [ - "-Dout=${placeholder "out"}" + "-Ddocs=true" ]; meta = with stdenv.lib; {