diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-02 21:41:16 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-02 21:41:16 +0100 |
| commit | d09b722f7705c7648458c0a6c5e9e7cd12b4a8ef (patch) | |
| tree | 2cd4f39b4663b9fc54e03e7b7106d7aca7b44127 /pkgs/tools/admin | |
| parent | 81460560c3114fd36e7e0249ce033c55003ca1a5 (diff) | |
| parent | b802a7be880becece15c378349c623128592c507 (diff) | |
| download | nixlib-d09b722f7705c7648458c0a6c5e9e7cd12b4a8ef.tar nixlib-d09b722f7705c7648458c0a6c5e9e7cd12b4a8ef.tar.gz nixlib-d09b722f7705c7648458c0a6c5e9e7cd12b4a8ef.tar.bz2 nixlib-d09b722f7705c7648458c0a6c5e9e7cd12b4a8ef.tar.lz nixlib-d09b722f7705c7648458c0a6c5e9e7cd12b4a8ef.tar.xz nixlib-d09b722f7705c7648458c0a6c5e9e7cd12b4a8ef.tar.zst nixlib-d09b722f7705c7648458c0a6c5e9e7cd12b4a8ef.zip | |
Merge master into x-updates
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/gtk-vnc/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 1fda870d5fbb..44a421e2ba3d 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,17 +1,17 @@ x@{builderDefsPackage , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 - , libffi, cyrus_sasl, intltool, perl, perlPackages, firefox36Pkgs + , libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt , ...}: builderDefsPackage (a : let helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["perlPackages" "firefox36Pkgs"]; + ["perlPackages" "firefoxPkgs"]; buildInputs = (map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames))) - ++ [perlPackages.TextCSV firefox36Pkgs.xulrunner ]; + ++ [perlPackages.TextCSV firefoxPkgs.xulrunner ]; sourceInfo = rec { baseName="gtk-vnc"; majorVersion="0.4"; |