chore(deps): adapt nix derivation for lief.

Adapted CXX flags so warnings are no longer displayed when building with clang++ on OSX. The nixpkgs derivation[0] for lief made use of "/build/source" symlink, which is not available on Darwin. [0]: https://github.com/NixOS/nixpkgs/blob/8efd5d1e283604f75a808a20e6cde0ef313d07d4/pkgs/development/libraries/lief/default.nix#L37
onekey-sec · Oct 24, 2023 · 576d0da · 576d0da
1 parent d23de21
commit 576d0da
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 9 deletions.
diff --git a/nix/_sources/generated.json b/nix/_sources/generated.json
@@ -14,6 +14,26 @@
         },
         "version": "0.4.5"
     },
+    "lief": {
+        "cargoLocks": null,
+        "date": null,
+        "extract": null,
+        "name": "lief",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "lief-project",
+            "repo": "LIEF",
+            "rev": "0.13.2",
+            "sha256": "sha256-lH4SqwPB2Jp/wUI2Cll67PQbHbwMqpNuLy/ei8roiHg=",
+            "type": "github"
+        },
+        "version": "0.13.2"
+    },
     "lzallright": {
         "cargoLocks": {
             "Cargo.lock": [

diff --git a/nix/_sources/generated.nix b/nix/_sources/generated.nix
@@ -9,6 +9,17 @@
       sha256 = "sha256-+cPOzzO3bCQAu8LrbjUJ5S/SR5OFitOYLIu5L9t/q+k=";
     };
   };
+  lief = {
+    pname = "lief";
+    version = "0.13.2";
+    src = fetchFromGitHub {
+      owner = "lief-project";
+      repo = "LIEF";
+      rev = "0.13.2";
+      fetchSubmodules = false;
+      sha256 = "sha256-lH4SqwPB2Jp/wUI2Cll67PQbHbwMqpNuLy/ei8roiHg=";
+    };
+  };
   lzallright = {
     pname = "lzallright";
     version = "v0.2.3";

diff --git a/nvfetcher.toml b/nvfetcher.toml
@@ -18,3 +18,7 @@ fetch.pypi = "treelib"
 [pyfatfs]
 src.pypi = "pyfatfs"
 fetch.pypi = "pyfatfs"
+
+[lief]
+src.github_tag = "lief-project/LIEF"
+fetch.github = "lief-project/LIEF"
diff --git a/overlay.nix b/overlay.nix
@@ -11,18 +11,40 @@ inputs: final: prev:
       hardeningDisable = (super.hardeningDisable or [ ]) ++ [ "fortify3" ];
     });
 
-  # Lief 12.3 incompatibility with Cmake 3.26
+  # Own package updated independently of nixpkgs
+  jefferson = final.callPackage ./nix/jefferson { };
+
   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"]'
+    outputs = [ "out" "py" ];
+
+    nativeBuildInputs = [
+      final.cmake
+      final.ninja
+    ];
+
+    # Not a propagatedBuildInput because only the $py output needs it; $out is
+    # just the library itself (e.g. C/C++ headers).
+    buildInputs = [
+      final.python3
+      final.python3.pkgs.setuptools
+      final.python3.pkgs.tomli
+    ];
+
+    CXXFLAGS = final.lib.optional final.stdenv.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ];
+
+    postBuild = ''
+      pushd ../api/python
+      ${final.python3.interpreter} setup.py build --parallel=$NIX_BUILD_CORES
+      popd
     '';
-  });
 
-  # Own package updated independently of nixpkgs
-  jefferson = final.callPackage ./nix/jefferson { };
+    postInstall = ''
+      pushd ../api/python
+      ${final.python3.interpreter} setup.py install --skip-build --root=/ --prefix=$py
+      popd
+    '';
+
+  });
 
   python3 = prev.python3 // {
     pkgs = prev.python3.pkgs.overrideScope