diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-20 20:47:49 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 07:46:58 +0100 |
| commit | 04325dfe7946c3af29aa34f913071ec953d54ec4 (patch) | |
| tree | 3df93ec3eca9c444aa2a6a5ba1d2c5bc7f5ad805 /pkgs | |
| parent | 6c5848a008ce125e540bba8dc3fe8cdbdb223c71 (diff) | |
| download | nixpkgs-04325dfe7946c3af29aa34f913071ec953d54ec4.tar nixpkgs-04325dfe7946c3af29aa34f913071ec953d54ec4.tar.gz nixpkgs-04325dfe7946c3af29aa34f913071ec953d54ec4.tar.bz2 nixpkgs-04325dfe7946c3af29aa34f913071ec953d54ec4.tar.lz nixpkgs-04325dfe7946c3af29aa34f913071ec953d54ec4.tar.xz nixpkgs-04325dfe7946c3af29aa34f913071ec953d54ec4.tar.zst nixpkgs-04325dfe7946c3af29aa34f913071ec953d54ec4.zip | |
gnome3.vino: clean up
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/vino/default.nix | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix index 4365451636a..65c6ace8eec 100644 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, lib, wrapGAppsHook , pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup , telepathySupport ? false, dbus-glib ? null, telepathy-glib ? null -, libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null -, zlib ? null, libjpeg ? null -, libXdamage ? null, libXfixes ? null, libXext ? null -, gnomeKeyringSupport ? false, libgnome-keyring3 ? null -, networkmanager ? null }: +, libsecret, gnutls, libgcrypt, avahi, zlib, libjpeg, libXdamage, libXfixes, libXext +, networkmanager }: with lib; @@ -18,28 +15,25 @@ stdenv.mkDerivation rec { sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "vino"; attrPath = "gnome3.vino"; }; - }; - doCheck = true; + nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ]; + buildInputs = [ - wrapGAppsHook - pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup - ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ] - ++ optional gnomeKeyringSupport libgnome-keyring3 - ++ filter (p: p != null) [ - libsecret gnutls libgcrypt avahi zlib libjpeg - libXdamage libXfixes libXext networkmanager - ]; - - preFixup = '' - export GSETTINGS_SCHEMAS_PATH="$out/share/gsettings-schemas/${name}:$GSETTINGS_SCHEMAS_PATH" - ''; + gnome3.defaultIconTheme gtk3 glib libXtst libnotify libsoup + libsecret gnutls libgcrypt avahi zlib libjpeg + libXdamage libXfixes libXext networkmanager + ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "vino"; + attrPath = "gnome3.vino"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Vino; + homepage = https://wiki.gnome.org/Projects/Vino; description = "GNOME desktop sharing server"; maintainers = with maintainers; [ lethalman domenkozar ]; license = licenses.gpl2; |