Skip to content

Commit

Permalink
Merge pull request #643 from onekey-sec/update_flake_lock_action
Browse files Browse the repository at this point in the history
Update flake.lock
  • Loading branch information
qkaiser authored Oct 8, 2023
2 parents 619cce5 + a418623 commit a7a97c7
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 44 deletions.
72 changes: 36 additions & 36 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/pyfatfs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec {

nativeBuildInputs = with python3.pkgs; [ pytest-runner setuptools-scm ];

propagatedBuildInputs = with python3.pkgs; [ fs ];
propagatedBuildInputs = with python3.pkgs; [ pip fs ];

postPatch = ''
substituteInPlace ./setup.py --replace 'setuptools_scm~=5.0.0' setuptools_scm
Expand Down
9 changes: 2 additions & 7 deletions overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,8 @@ inputs: final: prev:
hardeningDisable = (super.hardeningDisable or [ ]) ++ [ "fortify3" ];
});

# Lief 12.3 incompatibility with Cmake 3.26
lief = prev.lief.overrideAttrs (super: {
postPatch = ''
substituteInPlace setup.py \
--replace \
'cmake_args = ["-DLIEF_FORCE_API_EXPORTS=ON", "-DLIEF_PYTHON_API=on"]' \
'cmake_args = ["-DLIEF_FORCE_API_EXPORTS=ON", "-DLIEF_PYTHON_API=on", "-DLIEF_EXAMPLES=off"]'
'';
meta.platform = super.meta.platform ++ [ final.lib.platforms.darwin ];
});

# Own package updated independently of nixpkgs
Expand All @@ -44,6 +38,7 @@ inputs: final: prev:

# Own package updated independently of nixpkgs
unblob-native = inputs.unblob-native.packages.${final.system}.default;

});
};

Expand Down

0 comments on commit a7a97c7

Please sign in to comment.