diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-08-11 23:35:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 23:35:50 +0200 |
| commit | d27f04e59ac5c7a52d1ce03681b62559ec054807 (patch) | |
| tree | a4897508fdca29cb7ea1611514bf29ddfedb87d1 /pkgs | |
| parent | bf5fe68ad208983688f7f19f24f76b3c295ba69a (diff) | |
| parent | 01ce25515e7f2b49788c31eb8fa5bc5b30a695c9 (diff) | |
| download | nixpkgs-d27f04e59ac5c7a52d1ce03681b62559ec054807.tar nixpkgs-d27f04e59ac5c7a52d1ce03681b62559ec054807.tar.gz nixpkgs-d27f04e59ac5c7a52d1ce03681b62559ec054807.tar.bz2 nixpkgs-d27f04e59ac5c7a52d1ce03681b62559ec054807.tar.lz nixpkgs-d27f04e59ac5c7a52d1ce03681b62559ec054807.tar.xz nixpkgs-d27f04e59ac5c7a52d1ce03681b62559ec054807.tar.zst nixpkgs-d27f04e59ac5c7a52d1ce03681b62559ec054807.zip | |
Merge pull request #94018 from r-ryantm/auto-update/gthree
gthree: 0.2.0 -> 0.9.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gthree/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/games/gnome-hexgl/default.nix | 10 |
2 files changed, 22 insertions, 12 deletions
diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix index 04d7c8d8f4d..2da9847f3cb 100644 --- a/pkgs/development/libraries/gthree/default.nix +++ b/pkgs/development/libraries/gthree/default.nix @@ -3,10 +3,10 @@ , fetchpatch , ninja , meson -, pkgconfig +, pkg-config , gobject-introspection , gtk-doc -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 , glib , gtk3 @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "gthree"; - version = "0.2.0"; + version = "0.9.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -25,32 +25,42 @@ stdenv.mkDerivation rec { owner = "alexlarsson"; repo = "gthree"; rev = version; - sha256 = "16ap1ampnzsyhrs84b168d6889lh8sjr2j5sqv9mdbnnhy72p5cd"; + sha256 = "09fcnjc3j21lh5fjf067wm35sb4qni4vgzing61kixnn2shy79iy"; }; + patches = [ + # Add option for disabling examples + (fetchpatch { + url = "https://github.com/alexlarsson/gthree/commit/75f05c40aba9d5f603d8a3c490c3406c1fe06776.patch"; + sha256 = "PBwLz4DLhC+7BtypVTFMFiF3hKAJeskU3XBKFHa3a84="; + }) + ]; + nativeBuildInputs = [ ninja meson - pkgconfig + pkg-config gtk-doc - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_43 gobject-introspection ]; buildInputs = [ epoxy + json-glib ]; propagatedBuildInputs = [ glib gtk3 graphene - json-glib ]; mesonFlags = [ "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}" + # Data for examples is useless when the example programs are not installed. + "-Dexamples=false" ]; meta = with stdenv.lib; { diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix index 6212c1bbec1..cfa9a0b81d0 100644 --- a/pkgs/games/gnome-hexgl/default.nix +++ b/pkgs/games/gnome-hexgl/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , ninja , meson -, pkgconfig +, pkg-config , gthree , gsound , epoxy @@ -11,19 +11,19 @@ stdenv.mkDerivation rec { pname = "gnome-hexgl"; - version = "0.2.0"; + version = "unstable-2020-07-24"; src = fetchFromGitHub { owner = "alexlarsson"; repo = "gnome-hexgl"; - rev = version; - sha256 = "08iy2iciscd2wbhh6v4cpghx8r94v1ffbgla9yb3bcsdhlag0iw4"; + rev = "f47a351055a235730795341dcd6b2397cc4bfa0c"; + sha256 = "yZWGymaSUfnCP8VAEdDH64w0muSnRK/XPi1/IqTrE4k="; }; nativeBuildInputs = [ ninja meson - pkgconfig + pkg-config ]; buildInputs = [ |