public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome3.gnome-software: fix build

Browse Source
This commit is contained in:
Jan Tojnar 2018-03-15 05:27:44 +01:00
parent e34d2ac4c7
commit 03e83a0893
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/desktops/gnome-3/core/gnome-software/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree { 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 }: , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,19 +20,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 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 = [ buildInputs = [
gnome3.gtk glib packagekit appstream-glib libsoup gnome3.gtk glib packagekit appstream-glib libsoup
gnome3.gsettings-desktop-schemas gnome3.gnome-desktop gnome3.gsettings-desktop-schemas gnome3.gnome-desktop
gtkspell3 json-glib libsecret ostree gspell json-glib libsecret ostree
polkit polkit
]; ];
# https://gitlab.gnome.org/GNOME/gnome-software/issues/320
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
mesonFlags = [ mesonFlags = [
"-Denable-flatpak=false" "-Denable-flatpak=false"
"-Denable-rpm=false" "-Denable-rpm=false"

2
pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch
View File

@ -5,7 +5,7 @@
/* find filename */ /* find filename */
- filename = g_build_filename (DATADIR, "xml", "iso-codes", "iso_639.xml", NULL); - 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)) { if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
g_free (filename); g_free (filename);
filename = g_build_filename ("/usr", "share", "xml", "iso-codes", "iso_639.xml", NULL); filename = g_build_filename ("/usr", "share", "xml", "iso-codes", "iso_639.xml", NULL);