From 03e83a08933b76dbe742c91750ee5b1f759ecda0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 15 Mar 2018 05:27:44 +0100 Subject: [PATCH] gnome3.gnome-software: fix build --- pkgs/desktops/gnome-3/core/gnome-software/default.nix | 9 +++------ .../desktops/gnome-3/core/gnome-software/fix-paths.patch | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 4fc825096e78..2c4663b54ec7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree -, glib, appstream-glib, libsoup, polkit, isocodes, gtkspell3, libxslt +, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { @@ -20,19 +20,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 - valgrind-light docbook_xsl gtk-doc desktop-file-utils + valgrind-light docbook_xsl gtk-doc desktop-file-utils gobjectIntrospection ]; buildInputs = [ gnome3.gtk glib packagekit appstream-glib libsoup gnome3.gsettings-desktop-schemas gnome3.gnome-desktop - gtkspell3 json-glib libsecret ostree + gspell json-glib libsecret ostree polkit ]; - # https://gitlab.gnome.org/GNOME/gnome-software/issues/320 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - mesonFlags = [ "-Denable-flatpak=false" "-Denable-rpm=false" diff --git a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch index 239e1781bb1b..6f443a8a43ed 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch @@ -5,7 +5,7 @@ /* find filename */ - filename = g_build_filename (DATADIR, "xml", "iso-codes", "iso_639.xml", NULL); -+ filename = g_build_filename ("@isoCodes@", "share", "xml", "iso-codes", "iso_639.xml", NULL); ++ filename = g_build_filename ("@isocodes@", "share", "xml", "iso-codes", "iso_639.xml", NULL); if (!g_file_test (filename, G_FILE_TEST_EXISTS)) { g_free (filename); filename = g_build_filename ("/usr", "share", "xml", "iso-codes", "iso_639.xml", NULL);