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

gnome-builder: 3.32.4 → 3.34.0

Browse Source 
* add pcre2
* don't override stdenv

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
This commit is contained in:
Tor Hedin Brønner 2019-09-02 16:44:11 +00:00
parent 1e3e7822a6
commit 5a5f149e10
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ gcc8Stdenv { stdenv
, ctags , ctags
, appstream-glib , appstream-glib
, desktop-file-utils , desktop-file-utils
@ -23,6 +23,7 @@
, ninja , ninja
, ostree , ostree
, pcre , pcre
, pcre2
, pkgconfig , pkgconfig
, python3 , python3
, sysprof , sysprof
@ -33,20 +34,16 @@
, wrapGAppsHook , wrapGAppsHook
, dbus , dbus
, xvfb_run , xvfb_run
, glib
}: }:
let
# Does not build with GCC 7
# https://gitlab.gnome.org/GNOME/gnome-builder/issues/868
stdenv = gcc8Stdenv;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-builder"; pname = "gnome-builder";
version = "3.32.4"; version = "3.34.0";
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 = "0xip58m206p8wa28p0a3y4ykylzr5xzmirjl3dspg4j25r08i8qr"; sha256 = "19i2ipgw48fpd50wacwyhj35hajlg7qcyxpj8rsqk4g21ijfykrg";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -82,6 +79,7 @@ stdenv.mkDerivation rec {
libxml2 libxml2
ostree ostree
pcre pcre
pcre2
python3 python3
sysprof sysprof
template-glib template-glib
@ -100,6 +98,8 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/meson/post_install.py patchShebangs build-aux/meson/post_install.py
''; '';
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
mesonFlags = [ mesonFlags = [
"-Dpython_libprefix=${python3.libPrefix}" "-Dpython_libprefix=${python3.libPrefix}"
"-Ddocs=true" "-Ddocs=true"