From 0a68123804c8d8d2887e6572a1150cabd1b2c491 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 18 Aug 2023 09:40:13 +0800 Subject: [PATCH] borgbackup: use python3Packages instead of python3.pkgs to fix cross compilation See also: Package sets within derivations (i.e. python3.pkgs) are not spliced https://github.com/NixOS/nixpkgs/issues/211340 --- pkgs/tools/backup/borgbackup/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 5104dfd37512..e35950bfdfa3 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -6,7 +6,7 @@ , lz4 , openssh , openssl -, python3 +, python3Packages , xxHash , zstd , installShellFiles @@ -14,7 +14,7 @@ , fetchPypi }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "borgbackup"; version = "1.2.4"; format = "pyproject"; @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { --replace "0o4755" "0o0755" ''; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python3Packages; [ cython setuptools-scm pkgconfig @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { acl ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python3Packages; [ msgpack packaging (if stdenv.isLinux then pyfuse3 else llfuse) @@ -72,7 +72,7 @@ python3.pkgs.buildPythonApplication rec { --zsh scripts/shell_completions/zsh/_borg ''; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ e2fsprogs py python-dateutil