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

gnome-builder: 3.30.3 -> 3.32.0

Browse Source 
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
Tor Hedin Brønner 2019-03-07 16:48:05 +01:00 committed by Jan Tojnar
parent d2c37618f5
commit d206f597b6
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/applications/editors/gnome-builder/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv { gcc8Stdenv
, ctags , ctags
, appstream-glib
, desktop-file-utils , desktop-file-utils
, docbook_xsl , docbook_xsl
, docbook_xml_dtd_43 , docbook_xml_dtd_43
, fetchurl , fetchurl
, flatpak , flatpak
, glibcLocales
, gnome3 , gnome3
, libgit2-glib , libgit2-glib
, gobject-introspection , gobject-introspection
@ -31,28 +31,33 @@
, vte , vte
, webkitgtk , webkitgtk
, wrapGAppsHook , wrapGAppsHook
, dbus
, xvfb_run
}: }:
let let
version = "3.30.3"; # Does not build with GCC 7
# https://gitlab.gnome.org/GNOME/gnome-builder/issues/868
stdenv = gcc8Stdenv;
in
stdenv.mkDerivation rec {
pname = "gnome-builder"; pname = "gnome-builder";
in stdenv.mkDerivation { version = "3.32.0";
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 = "11h6apjyah91djf77m8xkl5rvdz7mwpp3bjc4yzzs9lm3pag764r"; sha256 = "00l7sshpndk995aw98mjmsc3mxhxzynlp7il551iwwjjdbc70qp4";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
#appstream-glib # tests fail if these tools are available appstream-glib
desktop-file-utils desktop-file-utils
docbook_xsl docbook_xsl
docbook_xml_dtd_43 docbook_xml_dtd_43
glibcLocales # for Meson's gtkdochelper
gobject-introspection gobject-introspection
gtk-doc gtk-doc
hicolor-icon-theme hicolor-icon-theme
meson (meson.override ({ inherit stdenv; }))
ninja ninja
pkgconfig pkgconfig
python3 python3
@ -64,6 +69,7 @@ in stdenv.mkDerivation {
ctags ctags
flatpak flatpak
gnome3.devhelp gnome3.devhelp
gnome3.glade
libgit2-glib libgit2-glib
libpeas libpeas
vte vte
@ -83,6 +89,11 @@ in stdenv.mkDerivation {
webkitgtk webkitgtk
]; ];
checkInputs = [
dbus
xvfb_run
];
outputs = [ "out" "devdoc" ]; outputs = [ "out" "devdoc" ];
prePatch = '' prePatch = ''
@ -91,19 +102,25 @@ in stdenv.mkDerivation {
mesonFlags = [ mesonFlags = [
"-Dpython_libprefix=${python3.libPrefix}" "-Dpython_libprefix=${python3.libPrefix}"
"-Dwith_docs=true" "-Ddocs=true"
# Making the build system correctly detect clang header and library paths # Making the build system correctly detect clang header and library paths
# is difficult. Somebody should look into fixing this. # is difficult. Somebody should look into fixing this.
"-Dwith_clang=false" "-Dplugin_clang=false"
# Do not try to check if appstream images exist
"-Dnetwork_tests=false"
]; ];
# Some tests fail due to being unable to find the Vte typelib, and I don't # Some tests fail due to being unable to find the Vte typelib, and I don't
# understand why. Somebody should look into fixing this. # understand why. Somebody should look into fixing this.
doCheck = false; doCheck = true;
preInstall = '' checkPhase = ''
export LC_ALL="en_US.utf-8" export NO_AT_BRIDGE=1
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
meson test --print-errorlogs
''; '';
pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ]; pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ];