about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWael Nasreddine <wael.nasreddine@gmail.com>2019-02-15 17:29:35 -0800
committerGitHub <noreply@github.com>2019-02-15 17:29:35 -0800
commita0eb6c1f81e1d294726c644ff47f1e851afb2f10 (patch)
tree778de5264ad0708c289bf38595f0649971effbdb
parent91047d75e12f38a998a9bfc2b9eccf5174b6eeb3 (diff)
gnome3.dconf: fix the build on Darwin (#55800)
Fix the build on Darwin.

Please see https://gitlab.gnome.org/GNOME/dconf/issues/47 for more information.
-rw-r--r--pkgs/desktops/gnome-3/core/dconf/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 9c1d7d7d1a98c..1f55071c83d72 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3
-, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }:
+, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42, fetchpatch }:
 
 let
   pname = "dconf";
@@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
     sha256 = "1dq2dn7qmxr4fxzx9wnag89ck24gxq17p2n4gl81h4w8qdy3m6jl";
   };
 
+  patches = [
+    # Fix the build on Darwin
+    # Issue: https://gitlab.gnome.org/GNOME/dconf/issues/47
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/dconf/commit/49f4d916e1151af3975df52c522c69de98ed2fbb.patch";
+      sha256 = "00klkr1jzli9ap0aj6399m1bj2bxxz48pmcj4r16dsy6dfdl6325";
+    })
+  ];
+
   postPatch = ''
     chmod +x meson_post_install.py
     patchShebangs meson_post_install.py