cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

borgbackup: use python3Packages instead of python3.pkgs to fix cross compilation

Browse source 
See also: Package sets within derivations (i.e. python3.pkgs) are not spliced
          https://github.com/NixOS/nixpkgs/issues/211340
This commit is contained in:
Nick Cao 2023-08-18 09:40:13 +08:00 committed by Bjørn Forsman
parent 8be6c852be
commit 0a68123804
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/backup/borgbackup/default.nix
View file

@ -6,7 +6,7 @@
, lz4 , lz4
, openssh , openssh
, openssl , openssl
, python3 , python3Packages
, xxHash , xxHash
, zstd , zstd
, installShellFiles , installShellFiles
@ -14,7 +14,7 @@
, fetchPypi , fetchPypi
}: }:
python3.pkgs.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "borgbackup"; pname = "borgbackup";
version = "1.2.4"; version = "1.2.4";
format = "pyproject"; format = "pyproject";
@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec {
--replace "0o4755" "0o0755" --replace "0o4755" "0o0755"
''; '';
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3Packages; [
cython cython
setuptools-scm setuptools-scm
pkgconfig pkgconfig
@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec {
acl acl
]; ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3Packages; [
msgpack msgpack
packaging packaging
(if stdenv.isLinux then pyfuse3 else llfuse) (if stdenv.isLinux then pyfuse3 else llfuse)
@ -72,7 +72,7 @@ python3.pkgs.buildPythonApplication rec {
--zsh scripts/shell_completions/zsh/_borg --zsh scripts/shell_completions/zsh/_borg
''; '';
nativeCheckInputs = with python3.pkgs; [ nativeCheckInputs = with python3Packages; [
e2fsprogs e2fsprogs
py py
python-dateutil python-dateutil