diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-09-02 16:44:11 +0000 |
|---|---|---|
| committer | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-09-30 19:39:38 +0200 |
| commit | 5a5f149e1054a26b05c43ae23f35499e358af7c5 (patch) | |
| tree | 518cdefc9d15cd6fd4171e23e71fff093ec0970e | |
| parent | 1e3e7822a64fefb5ef98878047025efa6ae34b7b (diff) | |
| download | nixlib-5a5f149e1054a26b05c43ae23f35499e358af7c5.tar nixlib-5a5f149e1054a26b05c43ae23f35499e358af7c5.tar.gz nixlib-5a5f149e1054a26b05c43ae23f35499e358af7c5.tar.bz2 nixlib-5a5f149e1054a26b05c43ae23f35499e358af7c5.tar.lz nixlib-5a5f149e1054a26b05c43ae23f35499e358af7c5.tar.xz nixlib-5a5f149e1054a26b05c43ae23f35499e358af7c5.tar.zst nixlib-5a5f149e1054a26b05c43ae23f35499e358af7c5.zip | |
gnome-builder: 3.32.4 → 3.34.0
* add pcre2 * don't override stdenv Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
| -rw-r--r-- | pkgs/applications/editors/gnome-builder/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 740d65838c3f..a14487642452 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -1,4 +1,4 @@ -{ gcc8Stdenv +{ stdenv , ctags , appstream-glib , desktop-file-utils @@ -23,6 +23,7 @@ , ninja , ostree , pcre +, pcre2 , pkgconfig , python3 , sysprof @@ -33,20 +34,16 @@ , wrapGAppsHook , dbus , 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 { pname = "gnome-builder"; - version = "3.32.4"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xip58m206p8wa28p0a3y4ykylzr5xzmirjl3dspg4j25r08i8qr"; + sha256 = "19i2ipgw48fpd50wacwyhj35hajlg7qcyxpj8rsqk4g21ijfykrg"; }; nativeBuildInputs = [ @@ -82,6 +79,7 @@ stdenv.mkDerivation rec { libxml2 ostree pcre + pcre2 python3 sysprof template-glib @@ -100,6 +98,8 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/post_install.py ''; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + mesonFlags = [ "-Dpython_libprefix=${python3.libPrefix}" "-Ddocs=true" |