diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-24 15:00:10 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-25 15:57:24 +0200 |
commit | 40535ced631b3d7ef95a3235b7a64b20a97aecca (patch) | |
tree | 870a3a5c32eeb4645cb2ccf40d55ba78c1a12d41 /pkgs/desktops/gnome-3 | |
parent | 7a0dfc93bc27d9e4dd29ddf126bdd3715048e8ee (diff) | |
download | nixlib-40535ced631b3d7ef95a3235b7a64b20a97aecca.tar nixlib-40535ced631b3d7ef95a3235b7a64b20a97aecca.tar.gz nixlib-40535ced631b3d7ef95a3235b7a64b20a97aecca.tar.bz2 nixlib-40535ced631b3d7ef95a3235b7a64b20a97aecca.tar.lz nixlib-40535ced631b3d7ef95a3235b7a64b20a97aecca.tar.xz nixlib-40535ced631b3d7ef95a3235b7a64b20a97aecca.tar.zst nixlib-40535ced631b3d7ef95a3235b7a64b20a97aecca.zip |
gnome3.vinagre: clean up
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r-- | pkgs/desktops/gnome-3/apps/vinagre/default.nix | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index 2299aa1fb26d..a8fe76ee03f9 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool -, libsecret, itstool, makeWrapper, librsvg }: +, libsecret, itstool, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { name = "vinagre-${version}"; @@ -10,25 +10,25 @@ stdenv.mkDerivation rec { sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "vinagre"; attrPath = "gnome3.vinagre"; }; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 vte libxml2 gtk-vnc intltool libsecret - itstool makeWrapper gnome3.defaultIconTheme librsvg ]; + nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 vte libxml2 gtk-vnc libsecret gnome3.defaultIconTheme librsvg + ]; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; - preFixup = '' - wrapProgram "$out/bin/vinagre" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "vinagre"; + attrPath = "gnome3.vinagre"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Vinagre; description = "Remote desktop viewer for GNOME"; - platforms = platforms.linux; + homepage = https://wiki.gnome.org/Apps/Vinagre; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } |