diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-06-19 14:19:27 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-06-19 14:19:27 +0200 |
| commit | 005837d85ff9d62d4c74e6f1574b48336fb85271 (patch) | |
| tree | 19d006b9504337ef12d84c76813f200918c9f61b | |
| parent | d92ce0d552bc01b6945fb238a01a2ac63aa59838 (diff) | |
| download | nixlib-005837d85ff9d62d4c74e6f1574b48336fb85271.tar nixlib-005837d85ff9d62d4c74e6f1574b48336fb85271.tar.gz nixlib-005837d85ff9d62d4c74e6f1574b48336fb85271.tar.bz2 nixlib-005837d85ff9d62d4c74e6f1574b48336fb85271.tar.lz nixlib-005837d85ff9d62d4c74e6f1574b48336fb85271.tar.xz nixlib-005837d85ff9d62d4c74e6f1574b48336fb85271.tar.zst nixlib-005837d85ff9d62d4c74e6f1574b48336fb85271.zip | |
remove duplicated gtk-vnc
| -rw-r--r-- | pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.16/core/gtk-vnc/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.16/default.nix | 2 |
3 files changed, 2 insertions, 34 deletions
diff --git a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix index 38263ac73f89..b2cf8277641a 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool , libsecret, itstool, makeWrapper, librsvg }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0gs8sqd4r6jlgxn1b7ggyfcisig50z79p0rmigpzwpjjx1bh0z6p"; }; - buildInputs = [ pkgconfig gtk3 vte libxml2 gtk-vnc intltool libsecret + buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret itstool makeWrapper gnome3.defaultIconTheme librsvg ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gtk-vnc/default.nix b/pkgs/desktops/gnome-3/3.16/core/gtk-vnc/default.nix deleted file mode 100644 index ebe7370aba75..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gtk-vnc/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, gdk_pixbuf, pkgconfig, gtk3, cyrus_sasl -, gnutls, gobjectIntrospection, vala, intltool, libgcrypt }: - -stdenv.mkDerivation rec { - versionMajor = "0.5"; - versionMinor = "4"; - moduleName = "gtk-vnc"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "1rwwdh7lb16xdmy76ca6mpqfc3zfl3a4bkcr0qb6hs6ffrxak2j8"; - }; - - buildInputs = [ pkgconfig gtk3 gdk_pixbuf gnutls cyrus_sasl - gobjectIntrospection vala intltool libgcrypt ]; - - configureFlags = [ "--with-gtk=3.0" ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/gtk-vnc; - description = "A VNC viewer widget for GTK+"; - license = licenses.lgpl2; - maintainers = with maintainers; [ lethalman ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index 0c3d49f769f6..f92d09e9fe5f 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -151,8 +151,6 @@ let gtksourceview = callPackage ./core/gtksourceview { }; - gtk-vnc = callPackage ./core/gtk-vnc { }; - gucharmap = callPackage ./core/gucharmap { }; gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; |