summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-08-11 23:20:18 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-08-11 23:20:18 +0200
commite4fc19e66e2e9fdcde758750c95e885c714bf16e (patch)
tree7c14769b794cf4e600a6a27b688545329ef39acf
parent2988feba8cbcf87cc1156f924ad38d5918215a4c (diff)
downloadnixpkgs-e4fc19e66e2e9fdcde758750c95e885c714bf16e.tar
nixpkgs-e4fc19e66e2e9fdcde758750c95e885c714bf16e.tar.gz
nixpkgs-e4fc19e66e2e9fdcde758750c95e885c714bf16e.tar.bz2
nixpkgs-e4fc19e66e2e9fdcde758750c95e885c714bf16e.tar.lz
nixpkgs-e4fc19e66e2e9fdcde758750c95e885c714bf16e.tar.xz
nixpkgs-e4fc19e66e2e9fdcde758750c95e885c714bf16e.tar.zst
nixpkgs-e4fc19e66e2e9fdcde758750c95e885c714bf16e.zip
gthree: 0.2.0 -> 0.9.0
-rw-r--r--pkgs/development/libraries/gthree/default.nix24
1 files changed, 17 insertions, 7 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; {