commit 850846e1323fd1a8707e3ba0cae0f2dfaf995802 · pyrox.dev/nixpkgs

+25 -3
pkgs/applications/networking/dropbox/default.nix
···

       35
       35
        
         targetPkgs = pkgs: with pkgs; with xlibs; [

     

       36
       36
        
           libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender

     

       37
       37
        
           libXxf86vm libxcb xkeyboardconfig

     

       38
       38
       -
           curl dbus fontconfig freetype gcc glib gnutar libxml2 libxslt zlib

     

       38
       38
       +
           curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt

     

       39
       39
       +
           procps zlib

     

       39
       40
        
         ];

     

       40
       41
        
       

     

       41
       42
        
         extraInstallCommands = ''

     
···

       44
       45
        
         '';

     

       45
       46
        
       

     

       46
       47
        
         runScript = writeScript "install-and-start-dropbox" ''

     

       48
       48
       +
           export BROWSER=firefox

     

       49
       49
       +
       

     

       50
       50
       +
           set -e

     

       51
       51
       +
       

     

       52
       52
       +
           do_install=

     

       47
       53
        
           if ! [ -d "$HOME/.dropbox-dist" ]; then

     

       54
       54
       +
               do_install=1

     

       55
       55
       +
           else

     

       56
       56
       +
               installed_version=$(cat "$HOME/.dropbox-dist/VERSION")

     

       57
       57
       +
               latest_version=$(printf "${version}\n$installed_version\n" | sort -V | head -n 1)

     

       58
       58
       +
               if [ "x$installed_version" != "x$latest_version" ]; then

     

       59
       59
       +
                   do_install=1

     

       60
       60
       +
               fi

     

       61
       61
       +
           fi

     

       62
       62
       +
       

     

       63
       63
       +
           if [ -n "$do_install" ]; then

     

       64
       64
       +
               installer=$(mktemp)

     

       48
       65
        
               # Dropbox is not installed.

     

       49
       66
        
               # Download and unpack the client. If a newer version is available,

     

       50
       67
        
               # the client will update itself when run.

     

       51
       51
       -
               curl '${installer}' | tar -C "$HOME" -x -z

     

       68
       68
       +
               curl '${installer}' >"$installer"

     

       69
       69
       +
               pkill dropbox || true

     

       70
       70
       +
               rm -fr "$HOME/.dropbox-dist"

     

       71
       71
       +
               tar -C "$HOME" -x -z -f "$installer"

     

       72
       72
       +
               rm "$installer"

     

       52
       73
        
           fi

     

       53
       53
       -
           exec "$HOME/.dropbox-dist/dropboxd"

     

       74
       74
       +
       

     

       75
       75
       +
           exec "$HOME/.dropbox-dist/dropboxd" "$@"

     

       54
       76
        
         '';

     

       55
       77
        
       

     

       56
       78
        
         meta = with lib; {