git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #94018 from r-ryantm/auto-update/gthree

gthree: 0.2.0 -> 0.9.0

commitd27f04e59ac5c7a52d1ce03681b62559ec054807 authorJan Tojnar <jtojnar@gmail.com> dateTue 11 Aug 2020, 23:35 (6 years ago) parentbf5fe6801ce255
2 files changed+22−12
pkgs/development/libraries/gthree/default.nix+17−7 pkgs/games/gnome-hexgl/default.nix+5−5
pkgs/development/libraries/gthree/default.nix+17−7
@@ -3,10 +3,10 @@
33, fetchpatch
44, ninja
55, meson
6−, pkgconfig
6+, pkg-config
77, gobject-introspection
88, gtk-doc
9−, docbook_xsl
9+, docbook-xsl-nons
1010, docbook_xml_dtd_43
1111, glib
1212, gtk3
@@ -17,7 +17,7 @@
1717
1818stdenv.mkDerivation rec {
1919 pname = "gthree";
20− version = "0.2.0";
20+ version = "0.9.0";
2121
2222 outputs = [ "out" "dev" "devdoc" ];
2323
@@ -25,32 +25,42 @@ stdenv.mkDerivation rec {
2525 owner = "alexlarsson";
2626 repo = "gthree";
2727 rev = version;
28− sha256 = "16ap1ampnzsyhrs84b168d6889lh8sjr2j5sqv9mdbnnhy72p5cd";
28+ sha256 = "09fcnjc3j21lh5fjf067wm35sb4qni4vgzing61kixnn2shy79iy";
2929 };
3030
31+ patches = [
32+ # Add option for disabling examples
33+ (fetchpatch {
34+ url = "https://github.com/alexlarsson/gthree/commit/75f05c40aba9d5f603d8a3c490c3406c1fe06776.patch";
35+ sha256 = "PBwLz4DLhC+7BtypVTFMFiF3hKAJeskU3XBKFHa3a84=";
36+ })
37+ ];
38+
3139 nativeBuildInputs = [
3240 ninja
3341 meson
34− pkgconfig
42+ pkg-config
3543 gtk-doc
36− docbook_xsl
44+ docbook-xsl-nons
3745 docbook_xml_dtd_43
3846 gobject-introspection
3947 ];
4048
4149 buildInputs = [
4250 epoxy
51+ json-glib
4352 ];
4453
4554 propagatedBuildInputs = [
4655 glib
4756 gtk3
4857 graphene
49− json-glib
5058 ];
5159
5260 mesonFlags = [
5361 "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}"
62+ # Data for examples is useless when the example programs are not installed.
63+ "-Dexamples=false"
5464 ];
5565
5666 meta = with stdenv.lib; {
pkgs/games/gnome-hexgl/default.nix+5−5
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, ninja
44, meson
5−, pkgconfig
5+, pkg-config
66, gthree
77, gsound
88, epoxy
@@ -11,19 +11,19 @@
1111
1212stdenv.mkDerivation rec {
1313 pname = "gnome-hexgl";
14− version = "0.2.0";
14+ version = "unstable-2020-07-24";
1515
1616 src = fetchFromGitHub {
1717 owner = "alexlarsson";
1818 repo = "gnome-hexgl";
19− rev = version;
20− sha256 = "08iy2iciscd2wbhh6v4cpghx8r94v1ffbgla9yb3bcsdhlag0iw4";
19+ rev = "f47a351055a235730795341dcd6b2397cc4bfa0c";
20+ sha256 = "yZWGymaSUfnCP8VAEdDH64w0muSnRK/XPi1/IqTrE4k=";
2121 };
2222
2323 nativeBuildInputs = [
2424 ninja
2525 meson
26− pkgconfig
26+ pkg-config
2727 ];
2828
2929 buildInputs = [