From 65e147c2fbe85f8a773599783c1e1a7170952e96 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 13 Mar 2018 03:25:13 +0100 Subject: gnome3.dconf: fix build --- pkgs/desktops/gnome-3/core/dconf/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs/desktops/gnome-3/core/dconf') 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; -- cgit 1.4.1