diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-05 01:35:33 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-05 01:35:33 +0200 |
| commit | ff3c6feea869b6315a6aa0b77ebec6c7d01fb713 (patch) | |
| tree | cb225d2591b94b4f9e8282711d50480e5f067dd2 /pkgs/applications/editors/gnome-builder | |
| parent | 418628e1625eb9d000ccb1fb953058f362641946 (diff) | |
| download | nixlib-ff3c6feea869b6315a6aa0b77ebec6c7d01fb713.tar nixlib-ff3c6feea869b6315a6aa0b77ebec6c7d01fb713.tar.gz nixlib-ff3c6feea869b6315a6aa0b77ebec6c7d01fb713.tar.bz2 nixlib-ff3c6feea869b6315a6aa0b77ebec6c7d01fb713.tar.lz nixlib-ff3c6feea869b6315a6aa0b77ebec6c7d01fb713.tar.xz nixlib-ff3c6feea869b6315a6aa0b77ebec6c7d01fb713.tar.zst nixlib-ff3c6feea869b6315a6aa0b77ebec6c7d01fb713.zip | |
gnome-builder: Fix build
This was forgotten during GNOME 3.36 update so the upstreamed patches were not removed. Also needed to add libportal and could remove some old cruft.
Diffstat (limited to 'pkgs/applications/editors/gnome-builder')
| -rw-r--r-- | pkgs/applications/editors/gnome-builder/default.nix | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 6dd79fbf1176..8e5af1e81459 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -5,7 +5,6 @@ , docbook_xsl , docbook_xml_dtd_43 , fetchurl -, fetchpatch , flatpak , gnome3 , libgit2-glib @@ -18,6 +17,7 @@ , jsonrpc-glib , libdazzle , libpeas +, libportal , libxml2 , meson , ninja @@ -46,18 +46,6 @@ stdenv.mkDerivation rec { sha256 = "G0nl6DVzb3k6cN2guFIe/XNhFNhKbaq5e8wz62VA0Qo="; }; - patches = [ - # Fix build with Meson 0.52 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f.patch"; - sha256 = "0n8kg7nnjqmbnyag1ps6dvrlqrxc94djjncqx10d6y7ijwdxf4w8"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/da26dfbf78468f5ed724e022b300a07862a95833.patch"; - sha256 = "0psa65bzjpjj7vc5rknv2w2dz3p50jjv10s6j2fd6lpw8j2800k4"; - }) - ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -65,7 +53,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 gobject-introspection gtk-doc - (meson.override ({ inherit stdenv; })) + meson ninja pkgconfig python3 @@ -80,6 +68,7 @@ stdenv.mkDerivation rec { gnome3.glade libgit2-glib libpeas + libportal vte gspell gtk3 @@ -109,8 +98,6 @@ 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" |