From c5731a17d99553d79810791e5a5aff61344669d5 Mon Sep 17 00:00:00 2001
From: Rutherther <rutherther@proton.me>
Date: Wed, 11 Oct 2023 21:32:29 +0200
Subject: [PATCH] chore: remove naersk dependency

---
 default.nix | 17 +++++++++--------
 flake.lock  | 21 ---------------------
 flake.nix   |  8 ++------
 3 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/default.nix b/default.nix
index 6879672..77c7384 100644
--- a/default.nix
+++ b/default.nix
@@ -1,12 +1,11 @@
 { lib
-, naersk
 , stdenv
 , clangStdenv
+, rustPlatform
 , hostPlatform
 , targetPlatform
 , pkg-config
 , dbus
-, libiconv
 , rustfmt
 , cargo
 , rustc
@@ -15,21 +14,23 @@
 let
   cargoToml = (builtins.fromTOML (builtins.readFile ./Cargo.toml));
 in
-naersk.lib."${targetPlatform.system}".buildPackage rec {
+rustPlatform.buildRustPackage rec {
+  name = "${cargoToml.package.name}";
+  version = "${cargoToml.package.version}";
+
   src = ./.;
-  buildInputs = [
+  cargoHash = "sha256-ZpQXclS9jota0IqQBmvTNp1JXZOq0xD7dAP1k9Cr9ok=";
+
+  nativeBuildInputs = [
     rustfmt
     pkg-config
     cargo
     rustc
-    libiconv
     dbus
   ];
 
-  checkInputs = [ cargo rustc ];
-
+  checkInputs = [ cargo rustc dbus ];
   doCheck = true;
-  copyLibs = true;
 
   meta = {
     description = cargoToml.package.description;
diff --git a/flake.lock b/flake.lock
index bfe81fa..75bc4a5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,25 +1,5 @@
 {
   "nodes": {
-    "naersk": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1694081375,
-        "narHash": "sha256-vzJXOUnmkMCm3xw8yfPP5m8kypQ3BhAIRe4RRCWpzy8=",
-        "owner": "nmattia",
-        "repo": "naersk",
-        "rev": "3f976d822b7b37fc6fb8e6f157c2dd05e7e94e89",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nmattia",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1696757521,
@@ -38,7 +18,6 @@
     },
     "root": {
       "inputs": {
-        "naersk": "naersk",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index f16e369..2d5986c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,19 +3,15 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    naersk = {
-      url = "github:nmattia/naersk";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = { self, naersk, nixpkgs }: let
+  outputs = { self, nixpkgs }: let
     cargoToml = (builtins.fromTOML (builtins.readFile ./Cargo.toml));
     supportedSystems = ["x86_64-linux"];
     forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);
   in {
     overlay = final: prev: {
-      "${cargoToml.package.name}" = final.callPackage ./. { inherit naersk; };
+      "${cargoToml.package.name}" = final.callPackage ./. {};
     };
 
     packages = forAllSystems (system:
-- 
2.48.1