pyrox.dev / nixpkgs
lol
fork atom

gnome3.gnome-software: clean up

- Format expression
- Correct license

Jan Tojnar 27eb2fb8 e9d257c0

+68 -15
unified split
+68 -15
pkgs/desktops/gnome-3/core/gnome-software/default.nix
··· 1 - { lib, stdenv, fetchurl, substituteAll, pkg-config, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree 2 - , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd 3 - , gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts 4 - , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils 5 - , libsysprof-capture }: 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , substituteAll 5 + , pkg-config 6 + , meson 7 + , ninja 8 + , gettext 9 + , gnome3 10 + , wrapGAppsHook 11 + , packagekit 12 + , ostree 13 + , glib 14 + , appstream-glib 15 + , libsoup 16 + , polkit 17 + , isocodes 18 + , gspell 19 + , libxslt 20 + , gobject-introspection 21 + , flatpak 22 + , fwupd 23 + , gtk3 24 + , gsettings-desktop-schemas 25 + , gnome-desktop 26 + , libxmlb 27 + , gnome-online-accounts 28 + , json-glib 29 + , libsecret 30 + , valgrind-light 31 + , docbook-xsl-nons 32 + , docbook_xml_dtd_42 33 + , docbook_xml_dtd_43 34 + , gtk-doc 35 + , desktop-file-utils 36 + , libsysprof-capture 37 + }: 6 38 7 39 let 8 - 9 40 withFwupd = stdenv.isx86_64 || stdenv.isi686; 10 - 11 41 in 12 42 13 43 stdenv.mkDerivation rec { ··· 27 57 ]; 28 58 29 59 nativeBuildInputs = [ 30 - meson ninja pkg-config gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43 31 - valgrind-light docbook_xsl gtk-doc desktop-file-utils gobject-introspection 60 + meson 61 + ninja 62 + pkg-config 63 + gettext 64 + wrapGAppsHook 65 + libxslt 66 + docbook_xml_dtd_42 67 + docbook_xml_dtd_43 68 + valgrind-light 69 + docbook-xsl-nons 70 + gtk-doc 71 + desktop-file-utils 72 + gobject-introspection 32 73 ]; 33 74 34 75 buildInputs = [ 35 - gtk3 glib packagekit appstream-glib libsoup 36 - gsettings-desktop-schemas gnome-desktop 37 - gspell json-glib libsecret ostree 38 - polkit flatpak libxmlb gnome-online-accounts libsysprof-capture 76 + gtk3 77 + glib 78 + packagekit 79 + appstream-glib 80 + libsoup 81 + gsettings-desktop-schemas 82 + gnome-desktop 83 + gspell 84 + json-glib 85 + libsecret 86 + ostree 87 + polkit 88 + flatpak 89 + libxmlb 90 + gnome-online-accounts 91 + libsysprof-capture 39 92 ] ++ lib.optionals withFwupd [ 40 93 fwupd 41 94 ]; ··· 51 104 52 105 passthru = { 53 106 updateScript = gnome3.updateScript { 54 - packageName = "gnome-software"; 107 + packageName = pname; 55 108 attrPath = "gnome3.gnome-software"; 56 109 }; 57 110 }; ··· 59 112 meta = with lib; { 60 113 description = "Software store that lets you install and update applications and system extensions"; 61 114 homepage = "https://wiki.gnome.org/Apps/Software"; 62 - license = licenses.gpl2; 115 + license = licenses.gpl2Plus; 63 116 maintainers = teams.gnome.members; 64 117 platforms = platforms.linux; 65 118 };