diff options
| author | Aristid Breitkreuz <aristidb@gmail.com> | 2014-11-09 11:43:16 +0100 |
|---|---|---|
| committer | Aristid Breitkreuz <aristidb@gmail.com> | 2014-11-09 11:43:16 +0100 |
| commit | 03400ab9ae9380753bb22eb806a9775c892e2961 (patch) | |
| tree | 8fc28651ce407c7460667a8a46678d78fca7a4ec /pkgs/applications | |
| parent | c329e5bbd9e15748330af76be1e915a14bf65db8 (diff) | |
| parent | 2d8b43b6d3bc46fe4e205e947f16066c778c701c (diff) | |
| download | nixlib-03400ab9ae9380753bb22eb806a9775c892e2961.tar nixlib-03400ab9ae9380753bb22eb806a9775c892e2961.tar.gz nixlib-03400ab9ae9380753bb22eb806a9775c892e2961.tar.bz2 nixlib-03400ab9ae9380753bb22eb806a9775c892e2961.tar.lz nixlib-03400ab9ae9380753bb22eb806a9775c892e2961.tar.xz nixlib-03400ab9ae9380753bb22eb806a9775c892e2961.tar.zst nixlib-03400ab9ae9380753bb22eb806a9775c892e2961.zip | |
Merge pull request #4730 from shdpl/teamviewer
optional config for teamviewer
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/remote/teamviewer/8.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/networking/remote/teamviewer/9.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix index 459ae9fab82b..a47d7bad4c9d 100644 --- a/pkgs/applications/networking/remote/teamviewer/8.nix +++ b/pkgs/applications/networking/remote/teamviewer/8.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau -, bash, patchelf }: +, bash, patchelf, config }: let topath = "${wineUnstable}/bin"; @@ -10,8 +10,8 @@ in stdenv.mkDerivation { name = "teamviewer-8.0.17147"; src = fetchurl { - url = "http://download.teamviewer.com/download/version_8x/teamviewer_linux_x64.deb"; - sha256 = "0s5m15f99rdmspzwx3gb9mqd6jx1bgfm0d6rfd01k9rf7gi7qk0k"; + url = config.teamviewer8.url or "http://download.teamviewer.com/download/version_8x/teamviewer_linux_x64.deb"; + sha256 = config.teamviewer8.sha256 or "0s5m15f99rdmspzwx3gb9mqd6jx1bgfm0d6rfd01k9rf7gi7qk0k"; }; buildInputs = [ makeWrapper patchelf ]; diff --git a/pkgs/applications/networking/remote/teamviewer/9.nix b/pkgs/applications/networking/remote/teamviewer/9.nix index 76fb1f68fc76..6ae68aea9ea3 100644 --- a/pkgs/applications/networking/remote/teamviewer/9.nix +++ b/pkgs/applications/networking/remote/teamviewer/9.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau -, bash, patchelf }: +, bash, patchelf, config }: let topath = "${wineUnstable}/bin"; @@ -10,8 +10,8 @@ in stdenv.mkDerivation { name = "teamviewer-9.0.32150"; src = fetchurl { - url = "http://download.teamviewer.com/download/version_9x/teamviewer_linux_x64.deb"; - sha256 = "0wpwbx0xzn3vlzavszxhfvfcaj3pijlpwvlz5m7w19mb6cky3q13"; + url = config.teamviewer9.url or "http://download.teamviewer.com/download/version_9x/teamviewer_linux_x64.deb"; + sha256 = config.teamviewer9.sha256 or "0wpwbx0xzn3vlzavszxhfvfcaj3pijlpwvlz5m7w19mb6cky3q13"; }; buildInputs = [ makeWrapper patchelf ]; |