commit c3d503d33dd00d91de3cace86cdf33af75a9e2e7 · pyrox.dev/nixpkgs

+3 -3

nixos/modules/services/monitoring/teamviewer.nix

···

       14
       14
        
       

     

       15
       15
        
         options = {

     

       16
       16
        
       

     

       17
       17
       -
           services.teamviewer.enable = mkEnableOption "teamviewer daemon";

     

       17
       17
       +
           services.teamviewer.enable = mkEnableOption "TeamViewer daemon";

     

       18
       18
        
             

     

       19
       19
        
         };

     

       20
       20
        
       

     
···

       27
       27
        
           systemd.services.teamviewerd = {

     

       28
       28
        
             description = "TeamViewer remote control daemon";

     

       29
       29
        
       

     

       30
       30
       -
             wantedBy = [ "graphical.target" ];

     

       30
       30
       +
             wantedBy = [ "multi-user.target" ];

     

       31
       31
        
             after = [ "NetworkManager-wait-online.service" "network.target" ];

     

       32
       32
       -
             preStart = "mkdir -pv /var/tmp/teamviewer10/{logs,config}";

     

       32
       32
       +
             preStart = "mkdir -pv /var/lib/teamviewer /var/log/teamviewer";

     

       33
       33
        
       

     

       34
       34
        
             serviceConfig = {

     

       35
       35
        
               Type = "forking";

-57

pkgs/applications/networking/remote/teamviewer/10.nix

···

       1
       1
       -
       { stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes,

     

       2
       2
       -
       wineUnstable, makeWrapper, libXau , patchelf, config }:

     

       3
       3
       -
       

     

       4
       4
       -
       with stdenv.lib;

     

       5
       5
       -
       

     

       6
       6
       -
       let

     

       7
       7
       -
         topath = "${wineUnstable}/bin";

     

       8
       8
       -
       

     

       9
       9
       -
         toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") 

     

       10
       10
       -
           [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);

     

       11
       11
       -
       in

     

       12
       12
       -
       stdenv.mkDerivation {

     

       13
       13
       -
         name = "teamviewer-10.0.37742";

     

       14
       14
       -
         src = fetchurl {

     

       15
       15
       -
           url = config.teamviewer10.url or "http://download.teamviewer.com/download/teamviewer_amd64.deb";

     

       16
       16
       -
           sha256 = config.teamviewer10.sha256 or "10risay1a5a85ijbjaz2vxqbfxygpxslvh0dvzz32k988hr9p1gk";

     

       17
       17
       -
         };

     

       18
       18
       -
       

     

       19
       19
       -
         buildInputs = [ makeWrapper patchelf ];

     

       20
       20
       -
       

     

       21
       21
       -
         unpackPhase = ''

     

       22
       22
       -
           ar x $src

     

       23
       23
       -
           tar xf data.tar.gz

     

       24
       24
       -
         '';

     

       25
       25
       -
       

     

       26
       26
       -
         installPhase = ''

     

       27
       27
       -
           mkdir -p $out/share/teamviewer $out/bin

     

       28
       28
       -
           cp -a opt/teamviewer/* $out/share/teamviewer

     

       29
       29
       -
           rm -R $out/share/teamviewer/tv_bin/wine/{bin,lib,share}

     

       30
       30
       -
       

     

       31
       31
       -
           cat > $out/bin/teamviewer << EOF

     

       32
       32
       -
           #!${stdenv.shell}

     

       33
       33
       -
           export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}

     

       34
       34
       -
           export PATH=${topath}\''${PATH:+:\$PATH}

     

       35
       35
       -
           $out/share/teamviewer/tv_bin/script/teamviewer "\$@"

     

       36
       36
       -
           EOF

     

       37
       37
       -
           chmod +x $out/bin/teamviewer

     

       38
       38
       -
       

     

       39
       39
       -
           ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin/

     

       40
       40
       -
           rm -rf  $out/share/teamviewer/logfiles $out/share/teamviewer/config

     

       41
       41
       -
           ln -sv /var/tmp/teamviewer10/logs/ $out/share/teamviewer/logfiles

     

       42
       42
       -
           ln -sv /var/tmp/teamviewer10/config/ $out/share/teamviewer/config

     

       43
       43
       -
         '';

     

       44
       44
       -
       

     

       45
       45
       -
         # the fixupPhase undoes the rpath patch

     

       46
       46
       -
         postFixup = ''

     

       47
       47
       -
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd

     

       48
       48
       -
           patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd

     

       49
       49
       -
         '';

     

       50
       50
       -
       

     

       51
       51
       -
         meta = {

     

       52
       52
       -
           homepage = "http://www.teamviewer.com";

     

       53
       53
       -
           license = licenses.unfree;

     

       54
       54
       -
           description = "Desktop sharing application, providing remote support and online meetings";

     

       55
       55
       -
           maintainers = with maintainers; [ jagajaga ];

     

       56
       56
       -
         };

     

       57
       57
       -
       }

-47

pkgs/applications/networking/remote/teamviewer/8.nix

···

       1
       1
       -
       { stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau

     

       2
       2
       -
       , bash, patchelf, config }:

     

       3
       3
       -
       

     

       4
       4
       -
       let

     

       5
       5
       -
         topath = "${wineUnstable}/bin";

     

       6
       6
       -
       

     

       7
       7
       -
         toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") 

     

       8
       8
       -
           [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);

     

       9
       9
       -
       in

     

       10
       10
       -
       stdenv.mkDerivation {

     

       11
       11
       -
         name = "teamviewer-8.0.17147";

     

       12
       12
       -
         src = fetchurl {

     

       13
       13
       -
           url = config.teamviewer8.url or "http://download.teamviewer.com/download/version_8x/teamviewer_linux_x64.deb";

     

       14
       14
       -
           sha256 = config.teamviewer8.sha256 or "0s5m15f99rdmspzwx3gb9mqd6jx1bgfm0d6rfd01k9rf7gi7qk0k";

     

       15
       15
       -
         };

     

       16
       16
       -
       

     

       17
       17
       -
         buildInputs = [ makeWrapper patchelf ];

     

       18
       18
       -
       

     

       19
       19
       -
         unpackPhase = ''

     

       20
       20
       -
           ar x $src

     

       21
       21
       -
           tar xf data.tar.gz

     

       22
       22
       -
         '';

     

       23
       23
       -
       

     

       24
       24
       -
         installPhase = ''

     

       25
       25
       -
           mkdir -p $out/share/teamviewer8 $out/bin

     

       26
       26
       -
           cp -a opt/teamviewer8/* $out/share/teamviewer8

     

       27
       27
       -
           rm -R $out/share/teamviewer8/tv_bin/wine/{bin,lib,share}

     

       28
       28
       -
       

     

       29
       29
       -
           cat > $out/bin/teamviewer << EOF

     

       30
       30
       -
           #!${bash}/bin/sh

     

       31
       31
       -
           export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}

     

       32
       32
       -
           export PATH=${topath}\''${PATH:+:\$PATH}

     

       33
       33
       -
           $out/share/teamviewer8/tv_bin/script/teamviewer "\$@"

     

       34
       34
       -
           EOF

     

       35
       35
       -
           chmod +x $out/bin/teamviewer

     

       36
       36
       -
       

     

       37
       37
       -
           patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer8/tv_bin/teamviewerd

     

       38
       38
       -
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer8/tv_bin/teamviewerd

     

       39
       39
       -
           ln -s $out/share/teamviewer8/tv_bin/teamviewerd $out/bin/

     

       40
       40
       -
         '';

     

       41
       41
       -
       

     

       42
       42
       -
         meta = {

     

       43
       43
       -
           homepage = "http://www.teamviewer.com";

     

       44
       44
       -
           license = stdenv.lib.licenses.unfree;

     

       45
       45
       -
           description = "Desktop sharing application, providing remote support and online meetings";

     

       46
       46
       -
         };

     

       47
       47
       -
       }

-47

pkgs/applications/networking/remote/teamviewer/9.nix

···

       1
       1
       -
       { stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau

     

       2
       2
       -
       , bash, patchelf, config }:

     

       3
       3
       -
       

     

       4
       4
       -
       let

     

       5
       5
       -
         topath = "${wineUnstable}/bin";

     

       6
       6
       -
       

     

       7
       7
       -
         toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") 

     

       8
       8
       -
           [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);

     

       9
       9
       -
       in

     

       10
       10
       -
       stdenv.mkDerivation {

     

       11
       11
       -
         name = "teamviewer-9.0.32150";

     

       12
       12
       -
         src = fetchurl {

     

       13
       13
       -
           url = config.teamviewer9.url or "http://download.teamviewer.com/download/version_9x/teamviewer_linux_x64.deb";

     

       14
       14
       -
           sha256 = config.teamviewer9.sha256 or "0wpwbx0xzn3vlzavszxhfvfcaj3pijlpwvlz5m7w19mb6cky3q13";

     

       15
       15
       -
         };

     

       16
       16
       -
       

     

       17
       17
       -
         buildInputs = [ makeWrapper patchelf ];

     

       18
       18
       -
       

     

       19
       19
       -
         unpackPhase = ''

     

       20
       20
       -
           ar x $src

     

       21
       21
       -
           tar xf data.tar.gz

     

       22
       22
       -
         '';

     

       23
       23
       -
       

     

       24
       24
       -
         installPhase = ''

     

       25
       25
       -
           mkdir -p $out/share/teamviewer9 $out/bin

     

       26
       26
       -
           cp -a opt/teamviewer9/* $out/share/teamviewer9

     

       27
       27
       -
           rm -R $out/share/teamviewer9/tv_bin/wine/{bin,lib,share}

     

       28
       28
       -
       

     

       29
       29
       -
           cat > $out/bin/teamviewer << EOF

     

       30
       30
       -
           #!${bash}/bin/sh

     

       31
       31
       -
           export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}

     

       32
       32
       -
           export PATH=${topath}\''${PATH:+:\$PATH}

     

       33
       33
       -
           $out/share/teamviewer9/tv_bin/script/teamviewer "\$@"

     

       34
       34
       -
           EOF

     

       35
       35
       -
           chmod +x $out/bin/teamviewer

     

       36
       36
       -
       

     

       37
       37
       -
           patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer9/tv_bin/teamviewerd

     

       38
       38
       -
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd

     

       39
       39
       -
           ln -s $out/share/teamviewer9/tv_bin/teamviewerd $out/bin/

     

       40
       40
       -
         '';

     

       41
       41
       -
       

     

       42
       42
       -
         meta = {

     

       43
       43
       -
           homepage = "http://www.teamviewer.com";

     

       44
       44
       -
           license = stdenv.lib.licenses.unfree;

     

       45
       45
       -
           description = "Desktop sharing application, providing remote support and online meetings";

     

       46
       46
       -
         };

     

       47
       47
       -
       }

+86

pkgs/applications/networking/remote/teamviewer/default.nix

···

       1
       1
       +
       { stdenv, lib, fetchurl, xdg_utils, pkgs, pkgsi686Linux }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         version = "11.0.52520";

     

       5
       5
       +
       

     

       6
       6
       +
         ld32 =

     

       7
       7
       +
           if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"

     

       8
       8
       +
           else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"

     

       9
       9
       +
           else abort "Unsupported architecture";

     

       10
       10
       +
         ld64 = "${stdenv.cc}/nix-support/dynamic-linker";

     

       11
       11
       +
       

     

       12
       12
       +
         mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]);

     

       13
       13
       +
       

     

       14
       14
       +
         deps = ps: (with ps; [ dbus alsaLib fontconfig freetype libpng libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst ]);

     

       15
       15
       +
         tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux);

     

       16
       16
       +
         tvldpath64 = lib.makeLibraryPath (deps pkgs);

     

       17
       17
       +
       

     

       18
       18
       +
       in

     

       19
       19
       +
       stdenv.mkDerivation {

     

       20
       20
       +
         name = "teamviewer-${version}";

     

       21
       21
       +
         src = fetchurl {

     

       22
       22
       +
           # There is a 64-bit package, but it has no differences apart from Debian dependencies.

     

       23
       23
       +
           # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason.

     

       24
       24
       +
           url = "http://download.teamviewer.com/download/teamviewer_${version}_i386.deb";

     

       25
       25
       +
           sha256 = "1430dimcv69plpj0ad0wsn10k15x9fwlk6fiq7yz51qbcr5l9wk6";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         unpackPhase = ''

     

       29
       29
       +
           ar x $src

     

       30
       30
       +
           tar xf data.tar.*

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         installPhase = ''

     

       34
       34
       +
           mkdir -p $out/share/teamviewer $out/bin $out/share/applications

     

       35
       35
       +
           cp -a opt/teamviewer/* $out/share/teamviewer

     

       36
       36
       +
           rm -R \

     

       37
       37
       +
             $out/share/teamviewer/logfiles \

     

       38
       38
       +
             $out/share/teamviewer/config \

     

       39
       39
       +
             $out/share/teamviewer/tv_bin/{xdg-utils,RTlib} \

     

       40
       40
       +
             $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh}

     

       41
       41
       +
       

     

       42
       42
       +
           ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin

     

       43
       43
       +
           ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin

     

       44
       44
       +
           ln -s $out/share/teamviewer/tv_bin/desktop/teamviewer-teamviewer*.desktop $out/share/applications

     

       45
       45
       +
           ln -s /var/lib/teamviewer $out/share/teamviewer/config

     

       46
       46
       +
           ln -s /var/log/teamviewer $out/share/teamviewer/logfiles

     

       47
       47
       +
           ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils

     

       48
       48
       +
       

     

       49
       49
       +
           pushd $out/share/teamviewer/tv_bin

     

       50
       50
       +
       

     

       51
       51
       +
           sed -i "s,TV_LD32_PATH=.*,TV_LD32_PATH=$(cat ${ld32})," script/tvw_config

     

       52
       52
       +
           ${if stdenv.system == "x86_64-linux" then ''

     

       53
       53
       +
             sed -i "s,TV_LD64_PATH=.*,TV_LD64_PATH=$(cat ${ld64})," script/tvw_config

     

       54
       54
       +
           '' else ''

     

       55
       55
       +
             sed -i ",TV_LD64_PATH=.*,d" script/tvw_config

     

       56
       56
       +
           ''}

     

       57
       57
       +
       

     

       58
       58
       +
           sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/teamviewer-*.desktop

     

       59
       59
       +
       

     

       60
       60
       +
           for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/*; do

     

       61
       61
       +
             echo "patching $i"

     

       62
       62
       +
             patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${tvldpath32} $i || true

     

       63
       63
       +
           done

     

       64
       64
       +
           for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so; do

     

       65
       65
       +
             echo "patching $i"

     

       66
       66
       +
             patchelf --set-rpath ${tvldpath32} $i || true

     

       67
       67
       +
           done

     

       68
       68
       +
           ${if stdenv.system == "x86_64-linux" then ''

     

       69
       69
       +
             patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64

     

       70
       70
       +
           '' else ''

     

       71
       71
       +
             rm TVGuiSlave.64

     

       72
       72
       +
           ''}

     

       73
       73
       +
           popd

     

       74
       74
       +
         '';

     

       75
       75
       +
       

     

       76
       76
       +
         dontPatchELF = true;

     

       77
       77
       +
         dontStrip = true;

     

       78
       78
       +
       

     

       79
       79
       +
         meta = with stdenv.lib; {

     

       80
       80
       +
           homepage = "http://www.teamviewer.com";

     

       81
       81
       +
           license = licenses.unfree;

     

       82
       82
       +
           description = "Desktop sharing application, providing remote support and online meetings";

     

       83
       83
       +
           platforms = [ "i686-linux" "x86_64-linux" ];

     

       84
       84
       +
           maintainers = with maintainers; [ jagajaga ];

     

       85
       85
       +
         };

     

       86
       86
       +
       }

+3 -5

pkgs/top-level/all-packages.nix

···

       3172
       3172
        
       

     

       3173
       3173
        
         tcpflow = callPackage ../tools/networking/tcpflow { };

     

       3174
       3174
        
       

     

       3175
       3175
       -
         teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer/10.nix { };

     

       3176
       3176
       -
       

     

       3177
       3177
       -
         teamviewer8 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/8.nix { });

     

       3178
       3178
       -
       

     

       3179
       3179
       -
         teamviewer9 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/9.nix { });

     

       3175
       3175
       +
         teamviewer = callPackage ../applications/networking/remote/teamviewer {

     

       3176
       3176
       +
           stdenv = stdenv_32bit;

     

       3177
       3177
       +
         };

     

       3180
       3178
        
       

     

       3181
       3179
        
         telnet = callPackage ../tools/networking/telnet { };

     

       3182
       3180