From f37542d964db362f7e39231c845e8591fda669ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=BCller?= <neikos@neikos.email>
Date: Mon, 3 Mar 2025 10:54:55 +0100
Subject: [PATCH] Make cargo-dylint build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcel Müller <neikos@neikos.email>
---
 flake.nix            | 24 ++++++------------------
 lib/cargo-dylint.nix | 23 +++++++++++++++++------
 lib/default.nix      | 13 +++++++++----
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/flake.nix b/flake.nix
index 925ca26..fede805 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,10 +18,7 @@
       let
         pkgs = import inputs.nixpkgs {
           inherit system;
-          overlays = let
-            selfOverlay = _: _: inputs.self.packages."${system}" or {};
-          in [
-            selfOverlay
+          overlays = [
             inputs.rust-overlay.overlays.default
           ];
         };
@@ -29,27 +26,18 @@
         rustTarget = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
         craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rustTarget;
 
-        callPackage = pkgs.lib.callPackageWith (
-          pkgs
-          // {
-            inherit
-              inputs
-              craneLib
-              ;
-          }
-        );
-
         lib = import ./lib {
           inherit
             inputs
-            callPackage
+            craneLib
+            pkgs
             ;
         };
       in
       {
-        inherit lib;
-
-        packages = lib.packages;
+        packages = lib // {
+          rust = rustTarget;
+        };
 
         devShells.default = pkgs.mkShell {
           nativeBuildInputs = [
diff --git a/lib/cargo-dylint.nix b/lib/cargo-dylint.nix
index ab8cefe..8c6aa17 100644
--- a/lib/cargo-dylint.nix
+++ b/lib/cargo-dylint.nix
@@ -1,7 +1,9 @@
 {
   pkgs,
   craneLib,
-  ...
+
+  pkg-config,
+  openssl,
 }:
 
 let
@@ -14,15 +16,24 @@ let
     tag = "v${version}";
     sha256 = "sha256-Z8uuewp7Buoadayc0oTafmfvwNT36KukWKiHxL/mQfI=";
   };
+in
 
-  cargoArtifacts = craneLib.buildDepsOnly {
-    inherit pname version src;
-  };
-in craneLib.buildPackage {
+craneLib.buildPackage {
   inherit
-    cargoArtifacts
     pname
     version
     src
     ;
+
+  buildInputs = [
+    openssl
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  RUSTUP_TOOLCHAIN = "nightly-2025-02-28";
+
+  doCheck = false;
 }
diff --git a/lib/default.nix b/lib/default.nix
index 7a3b434..ef77125 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,10 +1,15 @@
 {
-  callPackage,
+  pkgs,
+  inputs,
+  craneLib,
   ...
 }:
 
-{
+let
+  callPackage = pkgs.lib.callPackageWith (pkgs // packages // { inherit inputs craneLib; });
   packages = {
-    cargo-dylint = callPackage ./cargo-dylint.nix {};
+    cargo-dylint = callPackage ./cargo-dylint.nix { };
   };
-}
+
+in
+packages