nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-23 20:44:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

mozillavpn: Use finalAttrs

Browse Source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
(cherry picked from commit fa03a53979)
This commit is contained in:
Anders Kaseorg 2024-05-17 16:57:58 -07:00
parent 8852e3c0f2
commit dcf3cef2e7
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/tools/networking/mozillavpn/default.nix
View File

@ -26,13 +26,13 @@
wrapQtAppsHook,
}:
let
stdenv.mkDerivation (finalAttrs: {
pname = "mozillavpn";
version = "2.21.0";
src = fetchFromGitHub {
owner = "mozilla-mobile";
repo = "mozilla-vpn-client";
rev = "v${version}";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-XBvKSgMuWgMuV+is2G028UNQ4hID7tKiHFuMdPOZcsI=";
};
@ -40,7 +40,7 @@ let
netfilterGoModules =
(buildGoModule {
inherit
inherit (finalAttrs)
pname
version
src
@ -51,31 +51,23 @@ let
}).goModules;
extensionBridgeDeps = rustPlatform.fetchCargoTarball {
inherit src patches;
name = "${pname}-${version}-extension-bridge";
inherit (finalAttrs) src patches;
name = "${finalAttrs.pname}-${finalAttrs.version}-extension-bridge";
preBuild = "cd extension/bridge";
hash = "sha256-1BXlp9AC9oQo/UzCtgNWVv8Er2ERoDLKdlTYXLzodMQ=";
};
signatureDeps = rustPlatform.fetchCargoTarball {
inherit src patches;
name = "${pname}-${version}-signature";
inherit (finalAttrs) src patches;
name = "${finalAttrs.pname}-${finalAttrs.version}-signature";
preBuild = "cd signature";
hash = "sha256-GtkDkeFdPsLuTpZh5UqIhFMpzW3HMkbz7npryOQkkGw=";
};
qtgleanDeps = rustPlatform.fetchCargoTarball {
inherit src patches;
name = "${pname}-${version}-qtglean";
inherit (finalAttrs) src patches;
name = "${finalAttrs.pname}-${finalAttrs.version}-qtglean";
preBuild = "cd qtglean";
hash = "sha256-HFmRcfxCcc83IPPIovbf3jNftp0olKQ6RzV8vPpCYAM=";
};
in
stdenv.mkDerivation {
inherit
pname
version
src
patches
;
buildInputs = [
libcap
@ -106,17 +98,17 @@ stdenv.mkDerivation {
postUnpack = ''
pushd source/extension/bridge
cargoDeps='${extensionBridgeDeps}' cargoSetupPostUnpackHook
cargoDeps='${finalAttrs.extensionBridgeDeps}' cargoSetupPostUnpackHook
extensionBridgeDepsCopy="$cargoDepsCopy"
popd
pushd source/signature
cargoDeps='${signatureDeps}' cargoSetupPostUnpackHook
cargoDeps='${finalAttrs.signatureDeps}' cargoSetupPostUnpackHook
signatureDepsCopy="$cargoDepsCopy"
popd
pushd source/qtglean
cargoDeps='${qtgleanDeps}' cargoSetupPostUnpackHook
cargoDeps='${finalAttrs.qtgleanDeps}' cargoSetupPostUnpackHook
qtgleanDepsCopy="$cargoDepsCopy"
popd
'';
@ -131,7 +123,7 @@ stdenv.mkDerivation {
substituteInPlace extension/CMakeLists.txt \
--replace '/etc' "$out/etc"
ln -s '${netfilterGoModules}' linux/netfilter/vendor
ln -s '${finalAttrs.netfilterGoModules}' linux/netfilter/vendor
pushd extension/bridge
cargoDepsCopy="$extensionBridgeDepsCopy" cargoSetupPostPatchHook
@ -170,4 +162,4 @@ stdenv.mkDerivation {
maintainers = with lib.maintainers; [ andersk ];
platforms = lib.platforms.linux;
};
}
})