ci: correct nix path expressions (#53)

Co-authored-by: Cyril Matthey-Doret <[email protected]>
sdsc-ordes · Dec 17, 2024 · a754e16 · a754e16
1 parent 942ccef
commit a754e16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tools/nix/flake.nix b/tools/nix/flake.nix
@@ -36,13 +36,14 @@
   };
 
   outputs = {
+    self,
     nixpkgs,
     flake-utils,
     rust-overlay,
     ...
   }: let
-    # This is string (without toString it would be a `path` which is put into the store)
-    rootDir = toString ./. + "../../..";
+    lib = nixpkgs.lib;
+    rootDir = ./../..;
   in
     flake-utils.lib.eachDefaultSystem
     # Creates an attribute map `{ devShells.<system>.default = ...}`
@@ -53,7 +54,6 @@
 
         # Import nixpkgs and load it into pkgs.
         # Overlay the rust toolchain
-        lib = nixpkgs.lib;
         pkgs = import nixpkgs {
           inherit system overlays;
         };

diff --git a/tools/nix/pkgs/tripsu.nix b/tools/nix/pkgs/tripsu.nix
@@ -10,12 +10,12 @@
     rustc = rustToolchain;
   };
 
-  cargoFile = /. + rootDir + "/Cargo.toml";
-  lockFile = /. + rootDir + "/Cargo.lock";
+  cargoFile = rootDir + "/Cargo.toml";
+  lockFile = rootDir + "/Cargo.lock";
 in
   rustPlatform.buildRustPackage {
     name = "tripsu";
-    src = /. + rootDir;
+    src = rootDir;
 
     version = (lib.importTOML cargoFile).package.version;