talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

python312Packages.fuse: fix cross build, cleanup, 1.0.7 -> 1.0.9 (#373202)

Browse Source
This commit is contained in:
Arne Keller 2025-01-13 13:34:44 +01:00 committed by GitHub
commit d554f2757a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/by-name/bu/bup/package.nix
View File

@ -42,7 +42,6 @@ stdenv.mkDerivation {
}; };
buildInputs = [ buildInputs = [
git
python3 python3
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -51,7 +50,13 @@ stdenv.mkDerivation {
makeWrapper makeWrapper
]; ];
postPatch = "patchShebangs ."; configurePlatforms = [ ];
postPatch = ''
patchShebangs --build .
substituteInPlace ./config/configure \
--replace-fail 'bup_git=' 'bup_git="${lib.getExe git}" #'
'';
dontAddPrefix = true; dontAddPrefix = true;
@ -62,6 +67,7 @@ stdenv.mkDerivation {
"LIBDIR=$(out)/lib/bup" "LIBDIR=$(out)/lib/bup"
]; ];
env.BUP_PYTHON_CONFIG = lib.getExe' (lib.getDev python3) "python-config";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration -Wno-error=implicit-int"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration -Wno-error=implicit-int";
postInstall = '' postInstall = ''
@ -88,5 +94,7 @@ stdenv.mkDerivation {
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ rnhmjoj ]; maintainers = with maintainers; [ rnhmjoj ];
# bespoke ./configure does not like cross
broken = stdenv.buildPlatform != stdenv.hostPlatform;
}; };
} }

20
pkgs/development/python-modules/fuse-python/default.nix
View File

@ -4,22 +4,32 @@
buildPythonPackage, buildPythonPackage,
fetchPypi, fetchPypi,
pkg-config, pkg-config,
setuptools,
fuse, fuse,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "fuse-python"; pname = "fuse-python";
version = "1.0.7"; version = "1.0.9";
format = "setuptools"; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit version;
hash = "sha256-MhiAY2UkCM1HKuu2+S0135LIu0IAk3H4yJJ7s35r3Rs="; pname = "fuse_python";
hash = "sha256-ntWVd8NqshjXAKooOfAh8SwlKzVxhgV1crmOGbwqhYk=";
}; };
buildInputs = [ fuse ]; postPatch = ''
substituteInPlace setup.py \
--replace-fail 'pkg-config' "${stdenv.cc.targetPrefix}pkg-config"
'';
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
build-system = [ setuptools ];
buildInputs = [ fuse ];
# no tests implemented # no tests implemented
doCheck = false; doCheck = false;