Unverified Commit 7aad54b5 authored by adisbladis's avatar adisbladis Committed by GitHub
Browse files

Merge pull request #170195 from adisbladis/rmfuse-0_2_3 

rmfuse: 0.2.1 -> 0.2.3
parents 85408763 9ea7bd4e

pkgs/tools/filesystems/rmfuse/default.nix

+18 −0
Original line number Diff line number Diff line
@@ -20,6 +20,24 @@ let 
          };

        });



        reportlab = let

          ft = pkgs.freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });

        in super.reportlab.overridePythonAttrs(old: {

          postPatch = ''

            substituteInPlace setup.py \

              --replace "mif = findFile(d,'ft2build.h')" "mif = findFile('${lib.getDev ft}','ft2build.h')"

          '';



          NIX_CFLAGS_COMPILE = "-I${pkgs.freetype}/include/freetype2";



          nativeBuildInputs = old.nativeBuildInputs ++ [

            pkgs.pkg-config

          ];

          buildInputs = old.buildInputs ++ [

            pkgs.freetype

          ];

        });



      })

    ];

  }).python.pkgs;

pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ self: super: { 
    _: {

      src = pkgs.fetchgit {

        url = "https://github.com/rschroll/rmfuse.git";

        rev = "fca03bcdd6dc118f2ba981410ec9dff7f7cb88ec";

        sha256 = "0i7dvvi2bp3hydjpzvr7vg10bx0wxz87spf7pg455aga8d0qhxgk";

        rev = "3796b8610c8a965a60a417fc0bf8ea5200b71fd2";

        sha256 = "03qxy95jpk741b81bd38y51d4a0vynx2y1g662bci9r6m7l14yav";

      };

    }

  );

pkgs/tools/filesystems/rmfuse/poetry.lock

+242 −196

File changed.

Preview size limit exceeded, changes collapsed.