Merge pull request #10 from NuschtOS/ci

NuschtOS · Oct 14, 2024 · 137b150 · 137b150
2 parents 57e77cc + 5da4d27
commit 137b150
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        module: [ ixx, fixx ]
+        module: [ libixx, ixx, fixx ]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/fixx/LICENSE-APACHE b/fixx/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
diff --git a/fixx/LICENSE-MIT b/fixx/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
diff --git a/fixx/README.md b/fixx/README.md
@@ -0,0 +1 @@
+../README.md
diff --git a/fixx/derivation.nix b/fixx/derivation.nix
@@ -15,10 +15,6 @@ rustPlatform.buildRustPackage rec {
   src = lib.cleanSource ../.;
   cargoLock = import ../lockfile.nix;
 
-  postPatch = ''
-    cp README.md LICENSE-{APACHE,MIT} fixx
-  '';
-
   nativeBuildInputs = [
     binaryen
     rustc.llvmPackages.lld

diff --git a/flake.nix b/flake.nix
@@ -27,6 +27,7 @@
           packages = {
             ixx = pkgs.callPackage ./ixx/derivation.nix { };
             fixx = pkgs.callPackage ./fixx/derivation.nix { };
+            libixx = pkgs.callPackage ./libixx/derivation.nix { };
           };
         }
       );

diff --git a/libixx/derivation.nix b/libixx/derivation.nix
@@ -0,0 +1,15 @@
+{ lib, rustPlatform }:
+
+let
+  manifest = (lib.importTOML ./Cargo.toml).package;
+in
+rustPlatform.buildRustPackage rec {
+  pname = "libixx";
+  inherit (manifest) version;
+
+  src = lib.cleanSource ../.;
+  cargoLock = import ../lockfile.nix;
+
+  cargoBuildFlags = "-p ${pname}";
+  cargoTestFlags = "-p ${pname}";
+}