From 686f548ab225f41220374948cc4a9fde0500f6d7 Mon Sep 17 00:00:00 2001
From: Marcin Kulik <m@ku1ik.com>
Date: Mon, 13 Oct 2025 20:51:02 +0200
Subject: [PATCH] Reorganize flake structure

---
 default.nix |  8 ++++----
 flake.nix   | 23 +++++++++++++----------
 shell.nix   | 13 +++++--------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/default.nix b/default.nix
index da9385a..7c15b97 100644
--- a/default.nix
+++ b/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   rust,
   makeRustPlatform,
-  packageToml,
+  version,
   libiconv,
   darwin,
   python3,
@@ -13,12 +13,12 @@
   rustc = rust;
 }).buildRustPackage
   {
-    pname = packageToml.name;
-    inherit (packageToml) version;
+    pname = "asciinema";
+    inherit version;
 
     src = builtins.path {
       path = ./.;
-      inherit (packageToml) name;
+      name = "asciinema";
     };
 
     dontUseCargoParallelTests = true;
diff --git a/flake.nix b/flake.nix
index 9594cfa..f2b4d22 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,21 +23,24 @@
         };
 
         packageToml = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package;
-
-        defaultPackage = pkgs.callPackage ./default.nix {
-          inherit packageToml;
-          rust = pkgs.rust-bin.stable.latest.minimal;
-        };
+        msrv = packageToml.rust-version;
       in
       {
-        formatter = pkgs.nixfmt-tree;
-
-        packages.default = defaultPackage;
+        packages.default = pkgs.callPackage ./default.nix {
+          version = packageToml.version;
+          rust = pkgs.rust-bin.stable.latest.minimal;
+        };
 
         devShells = pkgs.callPackages ./shell.nix {
-          inherit packageToml;
-          defaultPackage = defaultPackage;
+          package = self.packages.${system}.default;
+
+          rust = {
+            default = pkgs.rust-bin.stable.latest.minimal;
+            msrv = pkgs.rust-bin.stable.${msrv}.minimal;
+          };
         };
+
+        formatter = pkgs.nixfmt-tree;
       }
     );
 }
diff --git a/shell.nix b/shell.nix
index 92a4f36..73890f6 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,18 +1,15 @@
 {
-  defaultPackage,
+  package,
   shellcheck,
-  packageToml,
-  rust-bin,
   mkShell,
+  rust,
 }:
 let
-  msrv = packageToml.rust-version;
-
   mkDevShell =
     rust:
     mkShell {
       inputsFrom = [
-        (defaultPackage.override {
+        (package.override {
           rust = rust.override {
             extensions = [
               "rust-src"
@@ -28,6 +25,6 @@ let
     };
 in
 {
-  default = mkDevShell rust-bin.stable.latest.default;
-  msrv = mkDevShell rust-bin.stable.${msrv}.default;
+  default = mkDevShell rust.default;
+  msrv = mkDevShell rust.msrv;
 }