movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

mozillavpn: 2.26.0 → 2.27.0, patch for Qt 6.9 compatibility

Browse source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2025-04-20 01:38:49 -07:00
parent b024ced1aa
commit 914deb3f99
1 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
pkgs/by-name/mo/mozillavpn/package.nix
View file

@ -4,6 +4,7 @@
cargo, cargo,
cmake, cmake,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
go, go,
lib, lib,
libcap, libcap,
@ -22,15 +23,36 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mozillavpn"; pname = "mozillavpn";
version = "2.26.0"; version = "2.27.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mozilla-mobile"; owner = "mozilla-mobile";
repo = "mozilla-vpn-client"; repo = "mozilla-vpn-client";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-BKD8X4nPLyTtY0x06nCSRRK36XKucpnhvjJN8aZssUs="; hash = "sha256-TfiEc5Lptr0ntp4buEEWbQTvNkVjZbdMWDv8CEZa6IM=";
}; };
patches = [ ]; patches = [
# Provide default args for LottieStatus::changed so moc can call it (#10420)
(fetchpatch {
url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/e5abe5714a5b506e398c088d21672f00d6f93240.patch";
hash = "sha256-DU5wQ1DDF8DbmMIlohoEIDJ7/9+9GVwrvsr51T9bGx8=";
})
# Remove Qt.labls.qmlmodels usage (#10422)
(fetchpatch {
url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/4497972b1bf7b7f215dc6c1227d76d6825f5b958.patch";
hash = "sha256-RPRdARM/jXSHmTGGjiOrfJ7KVejp3JmUfsN5pmKYPuY=";
})
# Qt compat: Make sure to include what we use
(fetchpatch {
url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/0909d43447a7ddbc6ec20d108637524552848bd6.patch";
hash = "sha256-Hpn69hQxa269XH+Ku/MYD2GwdFhfCX4yoVRCEDfIOKc=";
})
# Use QDesktopUnixServices after qt 6.9.0
(fetchpatch {
url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/10424/commits/81e66044388459ffe2b08804ab5a326586ac7113.patch";
hash = "sha256-+v3NoTAdkjKEyBPbbJZQ2d11hJMyE3E4B9uYUerVa7c=";
})
];
netfilter = buildGoModule { netfilter = buildGoModule {
pname = "${finalAttrs.pname}-netfilter"; pname = "${finalAttrs.pname}-netfilter";
@ -45,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoVendor { cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src patches; inherit (finalAttrs) src patches;
hash = "sha256-tVTXlGO969qPR9/TbOJbDdOiwOI1PT11MvNYdLqgDlo="; hash = "sha256-SGC+YT5ATV/ZaP/wrm3c31OQBw6Pk8ZSXjxEPFdP2f8=";
}; };
buildInputs = [ buildInputs = [