Skip to content

Commit d302d0d

Browse files
authored
Merge pull request #665 from onekey-sec/revert-643-update_flake_lock_action
Revert "Update flake.lock"
2 parents a7a97c7 + 051cd1c commit d302d0d

File tree

3 files changed

+44
-39
lines changed

3 files changed

+44
-39
lines changed

flake.lock

Lines changed: 36 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/pyfatfs/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec {
99

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

12-
propagatedBuildInputs = with python3.pkgs; [ pip fs ];
12+
propagatedBuildInputs = with python3.pkgs; [ fs ];
1313

1414
postPatch = ''
1515
substituteInPlace ./setup.py --replace 'setuptools_scm~=5.0.0' setuptools_scm

overlay.nix

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,14 @@ inputs: final: prev:
1111
hardeningDisable = (super.hardeningDisable or [ ]) ++ [ "fortify3" ];
1212
});
1313

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

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

3945
# Own package updated independently of nixpkgs
4046
unblob-native = inputs.unblob-native.packages.${final.system}.default;
41-
4247
});
4348
};
4449

0 commit comments

Comments
 (0)