hiro/poetry2nix
1
0
Fork 0
mirror of https://github.com/vale981/poetry2nix synced 2025-03-05 09:11:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #745 from SemMulder/various-overrides-fixes

Browse source 
Various overrides fixes
This commit is contained in:
adisbladis 2022-10-10 14:57:35 +13:00 • committed by GitHub
commit 73c9f4bd1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
overrides/default.nix
View file

@ -130,9 +130,21 @@ lib.composeManyExtensions [
self.dopy self.dopy
self.ncclient self.ncclient
]; ];
} // lib.optionalAttrs (lib.versionOlder old.version "5.0") { }
prePatch = pkgs.python.pkgs.ansible.prePatch or ""; );
postInstall = pkgs.python.pkgs.ansible.postInstall or "";
ansible-base = super.ansible-base.overridePythonAttrs (
old:
{
prePatch = ''sed -i "s/\[python, /[/" lib/ansible/executor/task_executor.py'';
postInstall = ''
for m in docs/man/man1/*; do
install -vD $m -t $out/share/man/man1
done
'';
}
// lib.optionalAttrs (lib.versionOlder old.version "2.4") {
prePatch = ''sed -i "s,/usr/,$out," lib/ansible/constants.py'';
} }
); );
@ -1290,9 +1302,10 @@ lib.composeManyExtensions [
); );
open3d = super.open3d.overridePythonAttrs (old: { open3d = super.open3d.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or [ ]) ++ (with pkgs; [ buildInputs = (old.buildInputs or [ ]) ++ [
udev pkgs.udev
]); pkgs.libusb1
];
# TODO(Sem Mulder): Add overridable flags for CUDA/PyTorch/Tensorflow support. # TODO(Sem Mulder): Add overridable flags for CUDA/PyTorch/Tensorflow support.
autoPatchelfIgnoreMissingDeps = true; autoPatchelfIgnoreMissingDeps = true;
}); });
@ -1734,6 +1747,10 @@ lib.composeManyExtensions [
} }
); );
pyrealsense2 = super.pyrealsense2.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libusb1.out ];
});
pyrfr = super.pyrfr.overridePythonAttrs (old: { pyrfr = super.pyrfr.overridePythonAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.swig ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.swig ];
}); });