lib: refactor build-rust-package

2 files changed, 42 insertions, 45 deletions

diff --git a/lib/build-rust-package.nix b/lib/build-rust-package.nix
new file mode 100644
index 0000000..f1a6624
--- /dev/null
+++ b/lib/build-rust-package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+{
+  pname,
+  version,
+  githubOwner,
+  githubHash,
+  cargoHash,
+  description ? null,
+  license,
+  maintainers,
+  buildInputs ? [ ],
+  nativeBuildInputs ? [ ],
+}:
+rustPlatform.buildRustPackage rec {
+  inherit
+    pname
+    version
+    buildInputs
+    nativeBuildInputs
+    cargoHash
+    ;
+
+  src = fetchFromGitHub {
+    owner = githubOwner;
+    repo = pname;
+    rev = version;
+    hash = githubHash;
+  };
+
+  doCheck = false;
+
+  meta = with lib; {
+    inherit description license;
+    homepage = "https://github.com/${githubOwner}/${pname}";
+    inherit maintainers;
+    mainProgram = pname;
+  };
+}
diff --git a/lib/rust-utils.nix b/lib/rust-utils.nix
deleted file mode 100644
index 8b0efb6..0000000
--- a/lib/rust-utils.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-}:
-{
-  mkRustPackage =
-    {
-      pname,
-      version,
-      githubOwner,
-      githubHash,
-      cargoHash,
-      description ? null,
-      license,
-      maintainers,
-      buildInputs ? [ ],
-      nativeBuildInputs ? [ ],
-    }:
-    rustPlatform.buildRustPackage rec {
-      inherit
-        pname
-        version
-        buildInputs
-        nativeBuildInputs
-        cargoHash
-        ;
-
-      src = fetchFromGitHub {
-        owner = githubOwner;
-        repo = pname;
-        rev = version;
-        hash = githubHash;
-      };
-
-      doCheck = false;
-
-      meta = with lib; {
-        inherit description license;
-        homepage = "https://github.com/${githubOwner}/${pname}";
-        inherit maintainers;
-        mainProgram = pname;
-      };
-    };
-}