diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 14:07:16 +0000 |
| commit | e2698550456abba83c6dcd5d5e5a9990a0b96f8a (patch) | |
| tree | 79a56f0df3fa55e470d84b4dff6059fbf487ec18 /nixpkgs/pkgs/development/libraries/gthree | |
| parent | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (diff) | |
| parent | 84d74ae9c9cbed73274b8e4e00be14688ffc93fe (diff) | |
| download | nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.gz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.bz2 nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.lz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.xz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.zst nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.zip | |
Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gthree')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gthree/default.nix | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gthree/default.nix b/nixpkgs/pkgs/development/libraries/gthree/default.nix index 04d7c8d8f4d4..2da9847f3cb4 100644 --- a/nixpkgs/pkgs/development/libraries/gthree/default.nix +++ b/nixpkgs/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; { |