commit b4fc0f82bc039a9472ae842742a81cf95908b8c7 · pyrox.dev/nixpkgs

+12 -4

nixos/modules/programs/amnezia-vpn.nix

···

       10
       10
        
       {

     

       11
       11
        
         options.programs.amnezia-vpn = {

     

       12
       12
        
           enable = lib.mkEnableOption "The AmneziaVPN client";

     

       13
       13
       +
           package = lib.mkPackageOption pkgs "amnezia-vpn" { };

     

       13
       14
        
         };

     

       14
       15
        
       

     

       15
       16
        
         config = lib.mkIf cfg.enable {

     

       16
       16
       -
           environment.systemPackages = [ pkgs.amnezia-vpn ];

     

       17
       17
       -
           services.dbus.packages = [ pkgs.amnezia-vpn ];

     

       17
       17
       +
           environment.systemPackages = [ cfg.package ];

     

       18
       18
       +
           services.dbus.packages = [ cfg.package ];

     

       18
       19
        
           services.resolved.enable = true;

     

       19
       20
        
       

     

       20
       21
        
           systemd = {

     

       21
       21
       -
             packages = [ pkgs.amnezia-vpn ];

     

       22
       22
       -
             services."AmneziaVPN".wantedBy = [ "multi-user.target" ];

     

       22
       22
       +
             packages = [ cfg.package ];

     

       23
       23
       +
             services."AmneziaVPN" = {

     

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

     

       25
       25
       +
               path = with pkgs; [

     

       26
       26
       +
                 procps

     

       27
       27
       +
                 iproute2

     

       28
       28
       +
                 sudo

     

       29
       29
       +
               ];

     

       30
       30
       +
             };

     

       23
       31
        
           };

     

       24
       32
        
         };

     

       25
       33

+21 -23

pkgs/by-name/am/amnezia-vpn/package.nix

···

       12
       12
        
         shadowsocks-rust,

     

       13
       13
        
         cloak-pt,

     

       14
       14
        
         wireguard-tools,

     

       15
       15
       -
         procps,

     

       16
       16
       -
         iproute2,

     

       17
       17
       -
         sudo,

     

       18
       15
        
         libssh,

     

       19
       16
        
         zlib,

     

       20
       17
        
         tun2socks,

     

       21
       18
        
         xray,

     

       22
       19
        
         nix-update-script,

     

       20
       20
       +
         bash,

     

       23
       21
        
       }:

     

       24
       22
        
       let

     

       25
       23
        
         amnezia-tun2socks = tun2socks.overrideAttrs (

     
···

       83
       81
        
             substituteInPlace client/configurators/openvpn_configurator.cpp \

     

       84
       82
        
               --replace-fail ".arg(qApp->applicationDirPath());" ".arg(\"$out/libexec\");"

     

       85
       83
        
             substituteInPlace client/ui/qautostart.cpp \

     

       86
       86
       -
               --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png"

     

       84
       84
       +
               --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "AmneziaVPN"

     

       87
       85
        
             substituteInPlace deploy/installer/config/AmneziaVPN.desktop.in \

     

       88
       86
        
               --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png"

     

       89
       87
        
             substituteInPlace deploy/data/linux/AmneziaVPN.service \

     
···

       107
       105
        
         ];

     

       108
       106
        
       

     

       109
       107
        
         buildInputs = [

     

       108
       108
       +
           bash

     

       109
       109
       +
           kdePackages.qt5compat

     

       110
       110
       +
           kdePackages.qtremoteobjects

     

       111
       111
       +
           kdePackages.qtsvg

     

       110
       112
        
           libsecret

     

       111
       113
        
           qt6.qtbase

     

       112
       114
        
           qt6.qttools

     

       113
       113
       -
           kdePackages.qtremoteobjects

     

       114
       114
       -
           kdePackages.qtsvg

     

       115
       115
       -
           kdePackages.qt5compat

     

       116
       115
        
         ];

     

       117
       116
        
       

     

       118
       118
       -
         qtWrapperArgs = [

     

       119
       119
       -
           ''--prefix PATH : ${

     

       120
       120
       -
             lib.makeBinPath [

     

       121
       121
       -
               procps

     

       122
       122
       -
               iproute2

     

       123
       123
       -
               sudo

     

       124
       124
       -
             ]

     

       125
       125
       -
           }''

     

       126
       126
       -
         ];

     

       117
       117
       +
         installPhase = ''

     

       118
       118
       +
           runHook preInstall

     

       127
       119
        
       

     

       128
       128
       -
         postInstall = ''

     

       129
       120
        
           mkdir -p $out/bin $out/libexec $out/share/applications $out/share/pixmaps $out/lib/systemd/system

     

       130
       130
       -
           cp client/AmneziaVPN service/server/AmneziaVPN-service $out/bin/

     

       131
       131
       -
           cp ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/libexec/

     

       132
       132
       -
           cp ../AppDir/AmneziaVPN.desktop $out/share/applications/

     

       133
       133
       -
           cp ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/

     

       134
       134
       -
           cp ../deploy/data/linux/AmneziaVPN.service $out/lib/systemd/system/

     

       121
       121
       +
           install -m555 client/AmneziaVPN service/server/AmneziaVPN-service $out/bin/

     

       122
       122
       +
           install -m555 ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/libexec/

     

       123
       123
       +
           install -m444 ../AppDir/AmneziaVPN.desktop $out/share/applications/

     

       124
       124
       +
           install -m444 ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/

     

       125
       125
       +
           install -m444 ../deploy/data/linux/AmneziaVPN.service $out/lib/systemd/system/

     

       126
       126
       +
       

     

       127
       127
       +
           runHook postInstall

     

       128
       128
       +
         '';

     

       129
       129
       +
       

     

       130
       130
       +
         postFixup = ''

     

       131
       131
       +
           # Temporary unwrap non-binary executable until qt6.wrapQtAppsHook is fixed

     

       132
       132
       +
           mv $out/libexec/.update-resolv-conf.sh-wrapped $out/libexec/update-resolv-conf.sh

     

       135
       133
        
         '';

     

       136
       134
        
       

     

       137
       135
        
         passthru = {

     
···

       149
       147
        
         meta = with lib; {

     

       150
       148
        
           description = "Amnezia VPN Client";

     

       151
       149
        
           downloadPage = "https://amnezia.org/en/downloads";

     

       152
       152
       -
           homepage = "https://amnezia.org/en";

     

       150
       150
       +
           homepage = "https://github.com/amnezia-vpn/amnezia-client";

     

       153
       151
        
           license = licenses.gpl3;

     

       154
       152
        
           mainProgram = "AmneziaVPN";

     

       155
       153
        
           maintainers = with maintainers; [ sund3RRR ];