Unverified Commit d554f275 authored by Arne Keller's avatar Arne Keller Committed by GitHub
Browse files

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

parents bbc68500 6deb37cf

pkgs/by-name/bu/bup/package.nix

+10 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ stdenv.mkDerivation { 
  };



  buildInputs = [

    git

    python3

  ];

  nativeBuildInputs = [
@@ -51,7 +50,13 @@ stdenv.mkDerivation { 
    makeWrapper

  ];



  postPatch = "patchShebangs .";

  configurePlatforms = [ ];



  postPatch = ''

    patchShebangs --build .

    substituteInPlace ./config/configure \

      --replace-fail 'bup_git=' 'bup_git="${lib.getExe git}" #'

  '';



  dontAddPrefix = true;
@@ -62,6 +67,7 @@ stdenv.mkDerivation { 
    "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";



  postInstall = ''
@@ -88,5 +94,7 @@ stdenv.mkDerivation { 


    platforms = platforms.linux ++ platforms.darwin;

    maintainers = with maintainers; [ rnhmjoj ];

    # bespoke ./configure does not like cross

    broken = stdenv.buildPlatform != stdenv.hostPlatform;

  };

}

pkgs/development/python-modules/fuse-python/default.nix

+15 −5
Original line number Diff line number Diff line
@@ -4,22 +4,32 @@ 
  buildPythonPackage,

  fetchPypi,

  pkg-config,

  setuptools,

  fuse,

}:



buildPythonPackage rec {

  pname = "fuse-python";

  version = "1.0.7";

  format = "setuptools";

  version = "1.0.9";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-MhiAY2UkCM1HKuu2+S0135LIu0IAk3H4yJJ7s35r3Rs=";

    inherit version;

    pname = "fuse_python";

    hash = "sha256-ntWVd8NqshjXAKooOfAh8SwlKzVxhgV1crmOGbwqhYk=";

  };



  buildInputs = [ fuse ];

  postPatch = ''

    substituteInPlace setup.py \

      --replace-fail 'pkg-config' "${stdenv.cc.targetPrefix}pkg-config"

  '';



  nativeBuildInputs = [ pkg-config ];



  build-system = [ setuptools ];



  buildInputs = [ fuse ];



  # no tests implemented

  doCheck = false;