gnome3.vinagre: clean up

This commit is contained in:
Jan Tojnar 2018-08-24 15:00:10 +02:00
parent 7a0dfc93bc
commit 40535ced63
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool { stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool
, libsecret, itstool, makeWrapper, librsvg }: , libsecret, itstool, wrapGAppsHook, librsvg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vinagre-${version}"; name = "vinagre-${version}";
@ -10,25 +10,25 @@ stdenv.mkDerivation rec {
sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82";
}; };
passthru = { nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
updateScript = gnome3.updateScript { packageName = "vinagre"; attrPath = "gnome3.vinagre"; }; buildInputs = [
}; gtk3 vte libxml2 gtk-vnc libsecret gnome3.defaultIconTheme librsvg
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 vte libxml2 gtk-vnc intltool libsecret
itstool makeWrapper gnome3.defaultIconTheme librsvg ];
NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
preFixup = '' passthru = {
wrapProgram "$out/bin/vinagre" \ updateScript = gnome3.updateScript {
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" packageName = "vinagre";
''; attrPath = "gnome3.vinagre";
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Vinagre;
description = "Remote desktop viewer for GNOME"; description = "Remote desktop viewer for GNOME";
platforms = platforms.linux; homepage = https://wiki.gnome.org/Apps/Vinagre;
license = licenses.gpl2Plus;
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;
platforms = platforms.linux;
}; };
} }