aboutsummaryrefslogtreecommitdiff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/amnezia-client/default.nix70
-rw-r--r--pkgs/ansel/default.nix159
-rw-r--r--pkgs/default.nix7
-rw-r--r--pkgs/draw/default.nix15
-rw-r--r--pkgs/g-ls/default.nix22
-rw-r--r--pkgs/green-tunnel/default.nix16
-rw-r--r--pkgs/sddm-sugar-dark-theme/default.nix33
-rw-r--r--pkgs/spoofDPI/default.nix15
-rw-r--r--pkgs/spoofDPI/default.nix~13
9 files changed, 71 insertions, 279 deletions
diff --git a/pkgs/amnezia-client/default.nix b/pkgs/amnezia-client/default.nix
new file mode 100644
index 0000000..5e8dc60
--- /dev/null
+++ b/pkgs/amnezia-client/default.nix
@@ -0,0 +1,70 @@
+{ 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/ansel/default.nix b/pkgs/ansel/default.nix
deleted file mode 100644
index fed20a9..0000000
--- a/pkgs/ansel/default.nix
+++ /dev/null
@@ -1,159 +0,0 @@
-{ lib
-, stdenv
-, fetchgit
-, cmake
-, intltool
-, wrapGAppsHook
-, ocl-icd
-, desktop-file-utils
-, llvmPackages_13
-, python311Packages
-, clang
-, portmidi
-, libwebp
-, pkg-config
-, gettext
-, perl
-, libxml2
-, pugixml
-, libjpeg
-, colord-gtk
-, colord
-, openexr_3
-, lensfun
-, isocodes
-, zlib
-, exiv2
-, openjpeg
-, graphicsmagick
-, lua
-, osm-gps-map
-, libsecret
-, gmic
-, libavif
-, jasper
-, libjxl
-, libxslt
-, saxon
-, exiftool
-, pcre2
-, libheif
-, sqlite
-, librsvg
-, curl
-, opencl-clang
-, lcms
-, json-glib
-, ninja
-, gdk-pixbuf
-, glib
-, atkmm
-, cairo
-, cmocka
-, cups
-, gtk3
-, pango
-, libpng
-, libsoup
-, libtiff
-}:
-
-stdenv.mkDerivation rec {
- name = "ansel";
- version = "06d9cda";
- src = fetchgit {
- url = "https://github.com/aurelienpierreeng/${name}.git";
- rev = "06d9cda326f37dafe7e315a5440c8b8b78333ee1";
- hash = "sha256-b/O+ApenIphKJp/20ROy7/drQuo3mqQEvrkYDrSMxyc=";
- fetchSubmodules = true;
- };
- nativeBuildInputs = [
- gtk3
- cups
- cmake
- intltool
- desktop-file-utils
- llvmPackages_13.llvm
- pkg-config
- perl
- llvmPackages_13.clang
- opencl-clang
- ninja
- wrapGAppsHook
- ];
-
- buildInputs = [
- libtiff
- libsoup
- pango
- libpng
- cmocka
- python311Packages.jsonschema
- cairo
- atkmm
- gdk-pixbuf
- json-glib
- lcms
- curl
- librsvg
- sqlite
- exiftool
- libheif
- pcre2
- saxon
- libxslt
- libwebp
- pugixml
- libxml2
- libjpeg
- colord-gtk
- colord
- openexr_3
- lensfun
- isocodes
- zlib
- exiv2
- openjpeg
- graphicsmagick
- lua
- osm-gps-map
- libsecret
- llvmPackages_13.openmp
- gmic
- libavif
- jasper
- libjxl
- ];
- cmakeFlags = [
- "-G Ninja"
- "-DCMAKE_BUILD_TYPE=Release"
- "-DBINARY_PACKAGE_BUILD=ON"
- "-DCMAKE_INSTALL_LIBDIR=lib64"
- ];
-
- preFixup =
- let
- libPathEnvVar = "LD_LIBRARY_PATH";
- libPathPrefix = "$out/lib/ansel:${ocl-icd}/lib";
- in
- ''
- for f in $out/share/ansel/kernels/*.cl; do
- sed -r "s|#include \"(.*)\"|#include \"$out/share/ansel/kernels/\1\"|g" -i "$f"
- done
-
- gappsWrapperArgs+=(
- --prefix ${libPathEnvVar} ":" "${libPathPrefix}"
- )
- '';
-
- meta = with lib; {
- description = "Photo-editing software for digital artists";
- homepage = "https://ansel.photos/";
- license = licenses.gpl3Plus;
- platforms = platforms.linux;
- maintainers = with maintainers; [ spl3g ];
- };
-
-}
-
-
diff --git a/pkgs/default.nix b/pkgs/default.nix
index b206caf..d3b5dfe 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,11 +1,6 @@
{ pkgs ? import <nixpkgs> { } }: {
- sddm-sugar-dark-theme = pkgs.libsForQt5.callPackage ./sddm-sugar-dark-theme { };
tgs2png = pkgs.callPackage ./tgs2png { };
pokemon-colorscripts = pkgs.callPackage ./pokemon-colorscripts { };
- ansel = pkgs.callPackage ./ansel { };
- g-ls = pkgs.callPackage ./g-ls { };
- draw = pkgs.callPackage ./draw { };
tdlib = pkgs.callPackage ./tdlib { };
- spoofDPI = pkgs.callPackage ./spoofDPI { };
- green-tunnel = pkgs.callPackage ./green-tunnel { };
+ amnezia-client = pkgs.qt6Packages.callPackage ./amnezia-client { };
}
diff --git a/pkgs/draw/default.nix b/pkgs/draw/default.nix
deleted file mode 100644
index cd034db..0000000
--- a/pkgs/draw/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
- pname = "draw";
- version = "0.1.1";
-
- src = fetchFromGitHub {
- owner = "maaslalani";
- repo = "${pname}";
- rev = "v${version}";
- hash = "sha256-ItrIN2Jyk+aoG2xxHT546GBuUV7yQ+saypEZKSEdRmw=";
- };
-
- vendorHash = "sha256-wUGxg+cdNY5ekViN5nCuKAVEeTmUbiyrXsuwfhI/2iw=";
-}
diff --git a/pkgs/g-ls/default.nix b/pkgs/g-ls/default.nix
deleted file mode 100644
index 06e0a02..0000000
--- a/pkgs/g-ls/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
- pname = "g";
- version = "0.24.2";
- src = fetchFromGitHub {
- owner = "Equationzhao";
- repo = "${pname}";
- rev = "v${version}";
- hash = "sha256-JXNnbw1ckpTe/OHV8E6R1JCmQGfjythzrw67B5ZkQAM=";
- };
-
- vendorHash = "sha256-vAUPenFdzXXq48fc0EQYQDpiOvpHRz69D8gPVa+6gUI=";
-
- ldflags = [ "-s" "-v" ];
-
- postInstall = ''
- mkdir -p $out/usr/share/man/man1
- gzip -d man/g.1.gz
- cp man/g.1 $out/usr/share/man/man1/
- '';
-}
diff --git a/pkgs/green-tunnel/default.nix b/pkgs/green-tunnel/default.nix
deleted file mode 100644
index 02ef398..0000000
--- a/pkgs/green-tunnel/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ buildNpmPackage, fetchFromGitHub, lib }:
-
-buildNpmPackage rec {
- name = "GreenTunnel";
- version = "1.8.3";
-
- src = fetchFromGitHub {
- repo = name;
- owner = "SadeghHayeri";
- rev = "v${version}";
- sha256 = "06c90x2ykm350v2fd1zny0bh5s7hbchx457n916lgcbzzdq7yr6r";
- };
-
- npmDepsHash = "sha256-Z+oJ0ZySQA2rFz/l6HSY0QzZodKxQ9jm8h+D6m3JzV0=";
- dontNpmBuild = true;
-}
diff --git a/pkgs/sddm-sugar-dark-theme/default.nix b/pkgs/sddm-sugar-dark-theme/default.nix
deleted file mode 100644
index 2df1adc..0000000
--- a/pkgs/sddm-sugar-dark-theme/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, qtsvg, qtquickcontrols2, qtgraphicaleffects }:
-
-stdenv.mkDerivation {
- pname = "sddm-sugar-dark-theme";
- version = "1.2";
-
- src = fetchFromGitHub {
- owner = "MarianArlt";
- repo = "sddm-sugar-dark";
- rev = "ceb2c455663429be03ba62d9f898c571650ef7fe";
- sha256 = "0153z1kylbhc9d12nxy9vpn0spxgrhgy36wy37pk6ysq7akaqlvy";
- };
- propagatedBuildInputs = [
- qtsvg
- qtquickcontrols2
- qtgraphicaleffects
- ];
- BuildInputs = [
- qtsvg
- qtquickcontrols2
- qtgraphicaleffects
- ];
- dontWrapQtApps = true;
- postInstall = ''
- mkdir -p $out/share/sddm/themes/sugar-dark
- mv * $out/share/sddm/themes/sugar-dark/
- '';
- postFixup = ''
- echo ${qtgraphicaleffects} >> $out/nix-support/propageted-user-env-packages
- echo ${qtsvg} >> $out/nix-support/propageted-user-env-packages
- echo ${qtquickcontrols2} >> $out/nix-support/propageted-user-env-packages
- '';
-}
diff --git a/pkgs/spoofDPI/default.nix b/pkgs/spoofDPI/default.nix
deleted file mode 100644
index 33b10f6..0000000
--- a/pkgs/spoofDPI/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ fetchFromGitHub, buildGoModule, lib }:
-
-buildGoModule rec {
- name = "SpoofDPI";
- version = "0.8";
-
- src = fetchFromGitHub {
- repo = name;
- owner = "xvzc";
- rev = "363f022c91773acd62f306ba9bae5bfae4913c2a";
- sha256 = "0gyp4411brdfa9wybgn2z4ljnylid0r4xx6ydy0v56vqk4wrvw4h";
- };
-
- vendorHash = "sha256-ib9xRklkLfrDCuLf7zDkJE8lJiNiUMPZ01MDxvqho6o=";
-}
diff --git a/pkgs/spoofDPI/default.nix~ b/pkgs/spoofDPI/default.nix~
deleted file mode 100644
index ca3f71d..0000000
--- a/pkgs/spoofDPI/default.nix~
+++ /dev/null
@@ -1,13 +0,0 @@
-{ fetchFromGitHub, buildGoModule, lib }:
-
-buildGoModule rec {
- name = "SpoofDPI";
- version = "0.8";
-
- src = fetchFromGitHub {
- repo = name;
- owner = "xvzc";
- rev = "363f022c91773acd62f306ba9bae5bfae4913c2a";
- sha256 = "https://github.com/xvzc/SpoofDPI/tags";
- };
-}