diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 20:07:09 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-23 13:18:38 +0100 |
commit | 3b3e059dac6a3fa98ba518fba1852f9cad80b530 (patch) | |
tree | baf96cd4f035e7534d3fb97a93399d48b8daafc2 /pkgs | |
parent | e059d2288807812f56745052db6878669467ce58 (diff) |
gnome3.gnome-system-log: clean up
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-system-log/default.nix | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix index 673140c3e1b60..23a41b6d6ae6d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix @@ -1,34 +1,31 @@ { stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, wrapGAppsHook -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: +, gtk3, glib, wrapGAppsHook +, itstool, gnome3, libxml2 }: -stdenv.mkDerivation rec { - name = "gnome-system-log-3.9.90"; +let + pname = "gnome-system-log"; + version = "3.9.90"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411"; }; doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 ]; + buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bash gtk3 glib intltool itstool - gnome3.gsettings-desktop-schemas wrapGAppsHook libxml2 ]; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share" - ) - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-log/3.9/; description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs"; maintainers = gnome3.maintainers; license = licenses.gpl2; |