ref: use self instead of rootDir

Dich0tomy · May 25, 2024 · d6514c0 · d6514c0
1 parent 315f775
commit d6514c0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 27 deletions.
diff --git a/flake.nix b/flake.nix
@@ -11,26 +11,20 @@
     inputs.flake-parts.lib.mkFlake {inherit inputs;} {
       systems = import inputs.systems;
 
-      imports = [./nix/dependencies];
+      imports = [
+        ./nix/dependencies
+        ./nix/package
+      ];
 
       perSystem = {
         pkgs,
         system,
         lib,
         ...
-      }: let
-        rootDir = ./.;
-
-        version = lib.strings.fileContents ./VERSION;
-      in {
+      }: {
         formatter = pkgs.alejandra;
 
-        _module.args = {inherit rootDir version;};
-
-        imports = [
-          ./nix/package
-          ./nix/shell
-        ];
+        imports = [./nix/shell];
       };
     };
 }
diff --git a/nix/dependencies/default.nix b/nix/dependencies/default.nix
@@ -1,8 +1,4 @@
-{
-  inputs,
-  system,
-  ...
-}: {
+{inputs, ...}: {
   perSystem = {system, ...}: {
     _module.args = {
       pkgs = import inputs.nixpkgs {

diff --git a/nix/package/default.nix b/nix/package/default.nix
@@ -1,10 +1,13 @@
-{
-  pkgs,
-  rootDir,
-  version,
-  ...
-}: {
-  packages.default = pkgs.callPackage ./package.nix {
-    inherit rootDir version;
+{self, ...}: {
+  perSystem = {
+    pkgs,
+    lib,
+    ...
+  }: let
+    version = lib.strings.fileContents "${self}/VERSION";
+  in {
+    packages.default = pkgs.callPackage ./package.nix {
+      inherit self version;
+    };
   };
 }
diff --git a/nix/package/package.nix b/nix/package/package.nix
@@ -1,5 +1,5 @@
 {
-  rootDir,
+  self,
   version,
   stdenv,
   meson,
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     tl-expected
   ];
 
-  src = rootDir;
+  src = "${self}";
 
   mesonBuildType = "release";