about summary refs log tree commit diff
path: root/pkgs/applications/editors/gnome-builder
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2021-10-14 23:23:27 +0200
committerJan Tojnar <jtojnar@gmail.com>2021-10-15 02:49:09 +0200
commitb399f77c38b76560ad224471fc00e20a60f65cec (patch)
tree2a8149f75c719193d4a7ac5bb6832b3ca7588518 /pkgs/applications/editors/gnome-builder
parentb341f3bb43467049a43091c10959040a383d1f00 (diff)
downloadnixlib-b399f77c38b76560ad224471fc00e20a60f65cec.tar
nixlib-b399f77c38b76560ad224471fc00e20a60f65cec.tar.gz
nixlib-b399f77c38b76560ad224471fc00e20a60f65cec.tar.bz2
nixlib-b399f77c38b76560ad224471fc00e20a60f65cec.tar.lz
nixlib-b399f77c38b76560ad224471fc00e20a60f65cec.tar.xz
nixlib-b399f77c38b76560ad224471fc00e20a60f65cec.tar.zst
nixlib-b399f77c38b76560ad224471fc00e20a60f65cec.zip
gnome-builder: 3.40.2 → 41.1
https://gitlab.gnome.org/GNOME/gnome-builder/-/blob/41.1/NEWS
Diffstat (limited to 'pkgs/applications/editors/gnome-builder')
-rw-r--r--pkgs/applications/editors/gnome-builder/default.nix29
1 files changed, 16 insertions, 13 deletions
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index 998341d6bb52..38f38ae3a51b 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -1,17 +1,17 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , ctags
+, cmark
 , appstream-glib
 , desktop-file-utils
-, docbook_xsl
-, docbook_xml_dtd_43
 , fetchurl
 , flatpak
 , gnome
 , libgit2-glib
+, gi-docgen
 , gobject-introspection
 , glade
 , gspell
-, gtk-doc
 , gtk3
 , gtksourceview4
 , json-glib
@@ -39,20 +39,20 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-builder";
-  version = "3.40.2";
+  version = "41.1";
+
+  outputs = [ "out" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "16kikslvcfjqj4q3j857mq9i8cyd965b3lvfzcwijc91x3ylr15j";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    sha256 = "XVXkqqKkdYpGJj0cf9AJyz20RV4O1/nkTDoWNIYfo4o=";
   };
 
   nativeBuildInputs = [
     appstream-glib
     desktop-file-utils
-    docbook_xsl
-    docbook_xml_dtd_43
+    gi-docgen
     gobject-introspection
-    gtk-doc
     meson
     ninja
     pkg-config
@@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ctags
+    cmark
     flatpak
     gnome.devhelp
     glade
@@ -92,8 +93,6 @@ stdenv.mkDerivation rec {
     xvfb-run
   ];
 
-  outputs = [ "out" "devdoc" ];
-
   prePatch = ''
     patchShebangs build-aux/meson/post_install.py
   '';
@@ -134,9 +133,13 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  postFixup = ''
+    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+    moveToOutput share/doc/libide "$devdoc"
+  '';
+
   passthru.updateScript = gnome.updateScript {
     packageName = pname;
-    versionPolicy = "odd-unstable";
   };
 
   meta = with lib; {