ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

remove duplicated gtk-vnc

Browse Source
This commit is contained in:
Luca Bruno 2015-06-19 14:19:27 +02:00
parent d92ce0d552
commit 005837d85f
3 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix
View File

@ -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 = ''

30
pkgs/desktops/gnome-3/3.16/core/gtk-vnc/default.nix
View File

@ -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;
};
}

2
pkgs/desktops/gnome-3/3.16/default.nix
View File

@ -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; };