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

gnome3.gnome-software: clean up

Browse Source
This commit is contained in:
Jan Tojnar 2018-03-05 03:18:53 +01:00
parent ff5695fb6e
commit dc8184e121
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
, glib, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3, libxslt , glib, appstream-glib, libsoup, polkit, isocodes, gtkspell3, libxslt
, 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 {
@ -11,24 +11,28 @@ stdenv.mkDerivation rec {
sha256 = "00lfzvlicqd8gk5ijnjdi36ikmhdzvfjj993rpf7mm04ncw4k0za"; sha256 = "00lfzvlicqd8gk5ijnjdi36ikmhdzvfjj993rpf7mm04ncw4k0za";
}; };
passthru = { patches = [
updateScript = gnome3.updateScript { packageName = "gnome-software"; attrPath = "gnome3.gnome-software"; }; (substituteAll {
}; src = ./fix-paths.patch;
inherit isocodes;
})
];
nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook libxslt docbook_xml_dtd_42 nativeBuildInputs = [
valgrind-light docbook_xsl gtk-doc desktop-file-utils ]; meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42
buildInputs = [ gnome3.gtk glib packagekit appstream-glib libsoup valgrind-light docbook_xsl gtk-doc desktop-file-utils
gnome3.gsettings-desktop-schemas gnome3.gnome-desktop ];
gtkspell3 json-glib libsecret ostree
polkit attr acl libyaml ];
propagatedBuildInputs = [ isocodes ];
buildInputs = [
gnome3.gtk glib packagekit appstream-glib libsoup
gnome3.gsettings-desktop-schemas gnome3.gnome-desktop
gtkspell3 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"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
postPatch = ''
patchShebangs meson_post_install.sh
'';
mesonFlags = [ mesonFlags = [
"-Denable-flatpak=false" "-Denable-flatpak=false"
"-Denable-rpm=false" "-Denable-rpm=false"
@ -38,18 +42,18 @@ stdenv.mkDerivation rec {
"-Denable-gudev=false" "-Denable-gudev=false"
]; ];
postInstall = '' passthru = {
mkdir -p $out/share/xml/ updateScript = gnome3.updateScript {
ln -s ${isocodes}/share/xml/iso-codes $out/share/xml/iso-codes packageName = "gnome-software";
''; attrPath = "gnome3.gnome-software";
};
enableParallelBuilding = true; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://www.freedesktop.org/software/PackageKit/; description = "Software store that lets you install and update applications and system extensions";
platforms = platforms.linux; homepage = https://wiki.gnome.org/Apps/Software;
maintainers = gnome3.maintainers;
license = licenses.gpl2; license = licenses.gpl2;
description = "GNOME Software lets you install and update applications and system extensions."; maintainers = gnome3.maintainers;
platforms = platforms.linux;
}; };
} }

11
pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/src/gs-language.c
+++ b/src/gs-language.c
@@ -95,7 +95,7 @@
g_autoptr(GMarkupParseContext) context = NULL;
/* 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);
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);