summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3/core/dconf
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-03-13 03:25:13 +0100
committerJan Tojnar <jtojnar@gmail.com>2018-03-22 07:46:43 +0100
commit65e147c2fbe85f8a773599783c1e1a7170952e96 (patch)
tree5fdb60aae2c45c9c62426d97cc750d0627bf3da8 /pkgs/desktops/gnome-3/core/dconf
parent8db273f33085329a32f76118db2945e0a9d887ff (diff)
downloadnixlib-65e147c2fbe85f8a773599783c1e1a7170952e96.tar
nixlib-65e147c2fbe85f8a773599783c1e1a7170952e96.tar.gz
nixlib-65e147c2fbe85f8a773599783c1e1a7170952e96.tar.bz2
nixlib-65e147c2fbe85f8a773599783c1e1a7170952e96.tar.lz
nixlib-65e147c2fbe85f8a773599783c1e1a7170952e96.tar.xz
nixlib-65e147c2fbe85f8a773599783c1e1a7170952e96.tar.zst
nixlib-65e147c2fbe85f8a773599783c1e1a7170952e96.zip
gnome3.dconf: fix build
Diffstat (limited to 'pkgs/desktops/gnome-3/core/dconf')
-rw-r--r--pkgs/desktops/gnome-3/core/dconf/default.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 4c5d0c9637d9..9b1adeb953d6 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, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
+{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3
+, libxml2, docbook_xsl, makeWrapper }:
 
 let
   pname = "dconf";
@@ -13,16 +13,16 @@ stdenv.mkDerivation rec {
     sha256 = "0hn7v6769xabqz7kvyb2hfm19h46z1whkair7ff752zmbs3b7lv1";
   };
 
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
   outputs = [ "out" "lib" "dev" ];
 
-  nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ];
+  nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 docbook_xsl ];
   buildInputs = [ glib dbus-glib ];
 
-  postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace client/Makefile \
-      --replace "-soname=libdconf.so.1" "-install_name,libdconf.so.1"
-  '';
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;