diff options
| author | spl3g <spleefer6@yandex.ru> | 2024-04-13 02:51:40 +0300 |
|---|---|---|
| committer | spl3g <spleefer6@yandex.ru> | 2025-05-01 14:56:39 +0300 |
| commit | b33986c5fd1d3f7e7e8cf62aaeef3cf93345095d (patch) | |
| tree | 3c595ed0177ba98d24ea0cb8c931ab2b713936e2 | |
| parent | 5f89becff7cf8f4fd83e069459f6b8b5d773b956 (diff) | |
add some packages
add some packages
| -rw-r--r-- | pkgs/amnezia-client/default.nix | 70 | ||||
| -rw-r--r-- | pkgs/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/spmp/default.nix | 21 |
3 files changed, 23 insertions, 71 deletions
diff --git a/pkgs/amnezia-client/default.nix b/pkgs/amnezia-client/default.nix deleted file mode 100644 index 5e8dc60..0000000 --- a/pkgs/amnezia-client/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, libsecret -, libgcrypt -, openssl -, openvpn -, tun2socks -, cloak -, shadowsocks-libev -, wireguard-go -, xray -, qtbase -, wrapQtAppsHook -, qtremoteobjects -, qtsvg -, qttools -, qt5compat -, qtkeychain -}: - -stdenv.mkDerivation rec { - pname = "amnezia-client"; - version = "4.4.0.0"; - - src = fetchFromGitHub { - repo = "${pname}"; - owner = "amnezia-vpn"; - - rev = "${version}"; - sha256 = "0k0sjf1c8iqg9crq4sfzdg4cczaq5pbk5j2873yzsw88rps0awac"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - cmake - wrapQtAppsHook - pkg-config - ]; - - buildInputs = [ - qtbase - qtremoteobjects - qtsvg - qttools - qt5compat - qtkeychain - libsecret - libgcrypt - openssl - openvpn - tun2socks - cloak - shadowsocks-libev - wireguard-go - xray - ]; - - installPhase = '' - runHook preInstall - make install - mkdir $out/bin - mkdir -p $out/usr/share/{pixmaps,applications} - cp client/AmneziaVPN $out/bin/ - cp service/server/AmneziaVPN-service $out/bin/ - runHook postInstall - ''; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index d3b5dfe..598cfdf 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,5 +2,6 @@ tgs2png = pkgs.callPackage ./tgs2png { }; pokemon-colorscripts = pkgs.callPackage ./pokemon-colorscripts { }; tdlib = pkgs.callPackage ./tdlib { }; - amnezia-client = pkgs.qt6Packages.callPackage ./amnezia-client { }; + spmp = pkgs.callPackage ./spmp { }; + spmp-server = pkgs.callPackage ./spmp-server { }; } diff --git a/pkgs/spmp/default.nix b/pkgs/spmp/default.nix new file mode 100644 index 0000000..c52a5d0 --- /dev/null +++ b/pkgs/spmp/default.nix @@ -0,0 +1,21 @@ +{ lib +, appimageTools +, fetchurl +}: + +appimageTools.wrapType2 rec { + name = "spmp"; + version = "0.3.1"; + src = fetchurl { + url = "https://github.com/toasterofbread/spmp/releases/download/v${version}/spmp-v${version}-linux-x86_64.appimage"; + sha256 = "00nmz1v4w1l7qw0c1pm9vibklpvq1dg0npgvhlvncm6djiqs4af6"; + }; + extraPkgs = pkgs: with pkgs; [ + mpv + libxcrypt-legacy + zulu + curl + libappindicator-gtk3 + libdbusmenu + ]; +} |