Merge pull request #665 from onekey-sec/revert-643-update_flake_lock_…

…action Revert "Update flake.lock"
onekey-sec · Oct 9, 2023 · d302d0d · d302d0d
2 parents a7a97c7 + 051cd1c
commit d302d0d
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 39 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nix/pyfatfs/default.nix b/nix/pyfatfs/default.nix
@@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec {
 
   nativeBuildInputs = with python3.pkgs; [ pytest-runner setuptools-scm ];
 
-  propagatedBuildInputs = with python3.pkgs; [ pip fs ];
+  propagatedBuildInputs = with python3.pkgs; [ fs ];
 
   postPatch = ''
     substituteInPlace ./setup.py --replace 'setuptools_scm~=5.0.0' setuptools_scm

diff --git a/overlay.nix b/overlay.nix
@@ -11,8 +11,14 @@ inputs: final: prev:
       hardeningDisable = (super.hardeningDisable or [ ]) ++ [ "fortify3" ];
     });
 
+  # Lief 12.3 incompatibility with Cmake 3.26
   lief = prev.lief.overrideAttrs (super: {
-    meta.platform = super.meta.platform ++ [ final.lib.platforms.darwin ];
+    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"]'
+    '';
   });
 
   # Own package updated independently of nixpkgs
@@ -38,7 +44,6 @@ inputs: final: prev:
 
         # Own package updated independently of nixpkgs
         unblob-native = inputs.unblob-native.packages.${final.system}.default;
-
       });
   };