public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94018 from r-ryantm/auto-update/gthree 

gthree: 0.2.0 -> 0.9.0
This commit is contained in:
Jan Tojnar 2020-08-11 23:35:50 +02:00 committed by GitHub
parent bf5fe68ad2 01ce25515e
commit d27f04e59a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/gthree/default.nix
View File

@ -3,10 +3,10 @@
, fetchpatch , fetchpatch
, ninja , ninja
, meson , meson
, pkgconfig , pkg-config
, gobject-introspection , gobject-introspection
, gtk-doc , gtk-doc
, docbook_xsl , docbook-xsl-nons
, docbook_xml_dtd_43 , docbook_xml_dtd_43
, glib , glib
, gtk3 , gtk3
@ -17,7 +17,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gthree"; pname = "gthree";
version = "0.2.0"; version = "0.9.0";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
@ -25,32 +25,42 @@ stdenv.mkDerivation rec {
owner = "alexlarsson"; owner = "alexlarsson";
repo = "gthree"; repo = "gthree";
rev = version; 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 = [ nativeBuildInputs = [
ninja ninja
meson meson
pkgconfig pkg-config
gtk-doc gtk-doc
docbook_xsl docbook-xsl-nons
docbook_xml_dtd_43 docbook_xml_dtd_43
gobject-introspection gobject-introspection
]; ];
buildInputs = [ buildInputs = [
epoxy epoxy
json-glib
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
glib glib
gtk3 gtk3
graphene graphene
json-glib
]; ];
mesonFlags = [ mesonFlags = [
"-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}" "-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; { meta = with stdenv.lib; {

10
pkgs/games/gnome-hexgl/default.nix
View File

@ -2,7 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, ninja , ninja
, meson , meson
, pkgconfig , pkg-config
, gthree , gthree
, gsound , gsound
, epoxy , epoxy
@ -11,19 +11,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-hexgl"; pname = "gnome-hexgl";
version = "0.2.0"; version = "unstable-2020-07-24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alexlarsson"; owner = "alexlarsson";
repo = "gnome-hexgl"; repo = "gnome-hexgl";
rev = version; rev = "f47a351055a235730795341dcd6b2397cc4bfa0c";
sha256 = "08iy2iciscd2wbhh6v4cpghx8r94v1ffbgla9yb3bcsdhlag0iw4"; sha256 = "yZWGymaSUfnCP8VAEdDH64w0muSnRK/XPi1/IqTrE4k=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
ninja ninja
meson meson
pkgconfig pkg-config
]; ];
buildInputs = [ buildInputs = [