gnome-builder: 3.28.4 → 3.30.0

This commit is contained in:
Jan Tojnar 2018-09-13 03:18:50 +00:00
parent c36ffca064
commit c0b58d9532
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -3,7 +3,6 @@
, desktop-file-utils , desktop-file-utils
, docbook_xsl , docbook_xsl
, docbook_xml_dtd_43 , docbook_xml_dtd_43
, fetchpatch
, fetchurl , fetchurl
, flatpak , flatpak
, glibcLocales , glibcLocales
@ -12,7 +11,7 @@
, gspell , gspell
, gtk-doc , gtk-doc
, gtk3 , gtk3
, gtksourceview3 , gtksourceview4
, hicolor-icon-theme , hicolor-icon-theme
, json-glib , json-glib
, jsonrpc-glib , jsonrpc-glib
@ -31,14 +30,14 @@
, wrapGAppsHook , wrapGAppsHook
}: }:
let let
version = "3.28.4"; version = "3.30.0";
pname = "gnome-builder"; pname = "gnome-builder";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ibb74jlyrl5f6rj1b74196zfg2qaf870lxgi76qzpkgwq0iya05"; sha256 = "1pshzpjy9rk6gijlm97s316aihykzxrmb07vilp17q5857passak";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -67,7 +66,7 @@ in stdenv.mkDerivation {
gnome3.vte gnome3.vte
gspell gspell
gtk3 gtk3
gtksourceview3 gtksourceview4
json-glib json-glib
jsonrpc-glib jsonrpc-glib
libdazzle libdazzle
@ -87,24 +86,6 @@ in stdenv.mkDerivation {
patchShebangs build-aux/meson/post_install.py patchShebangs build-aux/meson/post_install.py
''; '';
patches = [
(fetchpatch {
name = "absolute-shared-library-path.patch";
url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/1011cabc519fd7322e2d695c79bfce3e18ff6200.patch";
sha256 = "1g12zziidzrphp527aa8sklfaln4qpjprkz73f0c9w5ph6k252fw";
})
(fetchpatch {
name = "python-libprefix.patch";
url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/43494ce83a347f369ed4cfb8dd71d3b93452736b.patch";
sha256 = "0kgi3n3g13n1j4xa61ln9xiahcfdc43bxi5mw4yva2d5px445msf";
})
(fetchpatch {
name = "ostree-dependency.patch";
url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/8b11773b65c95f464a0de16b91318c1ca73deeae.patch";
sha256 = "18r4hd90id0w6r0lzqpw83bcj45nm9jhr46a0ffi1mcayb18mgbk";
})
];
mesonFlags = [ mesonFlags = [
"-Dpython_libprefix=${python3.libPrefix}" "-Dpython_libprefix=${python3.libPrefix}"
"-Dwith_docs=true" "-Dwith_docs=true"