Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: PKGBUILD for across #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: PKGBUILD for across #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fca6dc
flake: use upstream qt6
NickCao May 26, 2022
c141d8a
fix: PKGBUILD for across
dctxmei Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 4 additions & 9 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
url = "github:itay-grudev/SingleApplication/0d7b2630bda26f7dd4752c90faa9719455cab433";
flake = false;
};
nixpkgs.url = "github:NixOS/nixpkgs?ref=pull/141883/head";
nixpkgs.url = "github:NixOS/nixpkgs";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = inputs@{ self, nixpkgs, flake-utils, ... }:
Expand All @@ -27,13 +27,13 @@
}
) // {
overlay = final: prev: {
across = final.qt6.mkDerivation {
across = final.stdenv.mkDerivation {
name = "across";
src = self;
inherit (final.qt6.qtbase) qtDocPrefix qtQmlPrefix qtPluginPrefix;
cmakeFlags = [ "-DFETCH_SINGLE_APPLICATION=OFF" ];
nativeBuildInputs = with final; [
cmake
ninja
pkg-config
qt6.wrapQtAppsHook
];
Expand All @@ -48,20 +48,15 @@
nlohmann_json
magic_enum
semver
qt6.qtwayland
qt6.qtbase
qt6.qt5compat
qt6.qttools
qt6.qttranslations
qt6.qtsvg
];
postPatch = ''
rm -fr 3rdpart/*
ln -s ${inputs.single_application} 3rdpart/SingleApplication
'';
dontWrapQtApps = true;
preFixup = with final.qt6;''
wrapQtApp "$out/bin/across" --prefix QML2_IMPORT_PATH : "${qtdeclarative}/qml:${qt5compat}/qml:${qtimageformats}/qml"
'';
};
magic_enum = final.stdenv.mkDerivation {
name = "magic_enum";
Expand Down
3 changes: 2 additions & 1 deletion pkgbuild/arch/across-dev-git/.SRCINFO
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pkgbase = across-dev-git
pkgdesc = The next GUI client for v2ray core (Development Branch)
pkgver = 0.1.1.r693.c0d88ea
pkgrel = 1
pkgrel = 2
url = https://github.com/ArkToria/ACross
arch = x86_64
license = GPL3
Expand All @@ -19,6 +19,7 @@ pkgbase = across-dev-git
depends = qt6-tools
depends = qt6-imageformats
depends = qt6-5compat
depends = qt6-shadertools
depends = curl
depends = fmt
depends = grpc
Expand Down
4 changes: 2 additions & 2 deletions pkgbuild/arch/across-dev-git/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
pkgname=across-dev-git
_pkgname=across
pkgver=0.1.1.r693.c0d88ea
pkgrel=1
pkgrel=2
pkgdesc="The next GUI client for v2ray core (Development Branch)"
arch=('x86_64')
url='https://github.com/ArkToria/ACross'
license=('GPL3')
depends=('hicolor-icon-theme' 'qt6-base' 'qt6-svg' 'qt6-quickcontrols2' 'qt6-translations'
'qt6-tools' 'qt6-imageformats' 'qt6-5compat' 'curl' 'fmt' 'grpc'
'qt6-tools' 'qt6-imageformats' 'qt6-5compat' 'qt6-shadertools' 'curl' 'fmt' 'grpc'
'nlohmann-json' 'protobuf' 'spdlog' 'zxing-cpp' 'clang')
makedepends=('git' 'cmake' 'clang' 'ninja' 'gcc' 'gtest')
optdepends=('v2ray: use system v2ray core.'
Expand Down
5 changes: 3 additions & 2 deletions pkgbuild/arch/across/.SRCINFO
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pkgbase = across
pkgdesc = The next GUI client for v2ray core
pkgver = 0.1.3
pkgrel = 1
pkgrel = 2
url = https://github.com/ArkToria/ACross
arch = x86_64
license = GPL3
Expand All @@ -19,6 +19,7 @@ pkgbase = across
depends = qt6-tools
depends = qt6-imageformats
depends = qt6-5compat
depends = qt6-shadertools
depends = curl
depends = fmt
depends = grpc
Expand All @@ -31,6 +32,6 @@ pkgbase = across
optdepends = noto-fonts: default display fonts
provides = across
source = across-0.1.3.tar.gz::https://github.com/ArkToria/ACross/archive/refs/tags/v0.1.3.tar.gz
sha256sums = 6e5c15bbc55e38204852011096f2afc09c35f1c1682f45da3cc85a005a5eaa3e
sha256sums = 5010a2473a4e25f4fcd329ca6ff54912157744f53a3b890fcd6f80c177172b32

pkgname = across
4 changes: 2 additions & 2 deletions pkgbuild/arch/across/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
pkgname=across
_pkgname=ACross
pkgver=0.1.3
pkgrel=1
pkgrel=2
pkgdesc="The next GUI client for v2ray core"
arch=('x86_64')
url='https://github.com/ArkToria/ACross'
license=('GPL3')
depends=('hicolor-icon-theme' 'qt6-base' 'qt6-svg' 'qt6-quickcontrols2' 'qt6-translations'
'qt6-tools' 'qt6-imageformats' 'qt6-5compat' 'curl' 'fmt' 'grpc'
'qt6-tools' 'qt6-imageformats' 'qt6-5compat' 'qt6-shadertools' 'curl' 'fmt' 'grpc'
'nlohmann-json' 'protobuf' 'spdlog' 'zxing-cpp' 'clang')
makedepends=('git' 'cmake' 'clang' 'ninja' 'gcc' 'gtest')
optdepends=('v2ray: use system v2ray core.'
Expand Down