Skip to content

Commit 10263b5

Browse files
authored
Merge pull request #690 from onekey-sec/update_flake_lock_action
Update flake.lock
2 parents 2b48fc2 + 345ec5e commit 10263b5

File tree

2 files changed

+18
-77
lines changed

2 files changed

+18
-77
lines changed

flake.lock

+18-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

overlay.nix

-59
Original file line numberDiff line numberDiff line change
@@ -15,65 +15,6 @@ final: prev:
1515
# Own package updated independently of nixpkgs
1616
jefferson = final.callPackage ./nix/jefferson { };
1717

18-
lief = prev.lief.overrideAttrs (super: with final; {
19-
20-
outputs = [ "out" "py" ];
21-
22-
nativeBuildInputs = [
23-
cmake
24-
ninja
25-
];
26-
27-
# Not a propagatedBuildInput because only the $py output needs it; $out is
28-
# just the library itself (e.g. C/C++ headers).
29-
buildInputs = with python3.pkgs; [
30-
python3
31-
setuptools
32-
tomli
33-
];
34-
35-
env.CXXFLAGS = toString (lib.optional stdenv.isLinux [ "-ffunction-sections" "-fdata-sections" "-fvisibility-inlines-hidden" "-static-libstdc++" "-static-libgcc" ]
36-
++ lib.optional stdenv.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]);
37-
38-
env.CFLAGS = toString (lib.optional stdenv.isLinux [ "-ffunction-sections" "-fdata-sections" "-static-libstdc++" "-static-libgcc" ]);
39-
env.LDFLAGS = toString (lib.optional stdenv.isLinux [ "-Wl,--gc-sections" "-Wl,--exclude-libs,ALL" ]);
40-
41-
42-
dontUseCmakeConfigure = true;
43-
44-
buildPhase = ''
45-
runHook preBuild
46-
47-
mkdir -p build
48-
cmake -S . -B build -GNinja -DCMAKE_LINK_WHAT_YOU_USE=on -DBUILD_SHARED_LIBS=on -DLIEF_INSTALL_COMPILED_EXAMPLES=off -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release
49-
50-
cmake --build build --target all
51-
52-
runHook postBuild
53-
'';
54-
55-
postBuild = ''
56-
pushd api/python
57-
${python3.interpreter} setup.py build --parallel=$NIX_BUILD_CORES
58-
popd
59-
'';
60-
61-
installPhase = ''
62-
runHook preInstall
63-
64-
cmake --build build --target install
65-
66-
runHook postInstall
67-
'';
68-
69-
postInstall = ''
70-
pushd api/python
71-
${python3.interpreter} setup.py install --skip-build --root=/ --prefix=$py
72-
popd
73-
'';
74-
75-
});
76-
7718
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
7819
(python-final: python-prev: {
7920
# Missing from nixpkgs

0 commit comments

Comments
 (0)