diff --git a/flake.lock b/flake.lock index a6e534e..33aa5a6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1772773019, @@ -18,8 +36,24 @@ }, "root": { "inputs": { + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e416ffb..9f2306c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,30 +2,35 @@ description = "mkv"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; }; outputs = - { self, nixpkgs }: - let - system = "x86_64-linux"; - pkgs = import nixpkgs { inherit system; }; - in - { - devShells.${system}.default = pkgs.mkShell { - packages = [ - pkgs.rustc - pkgs.cargo - pkgs.rustfmt - pkgs.rust-analyzer + { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { inherit system; }; + darwinBuildInputs = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [ + pkgs.libiconv ]; - }; - packages.${system}.default = pkgs.rustPlatform.buildRustPackage { - pname = "mkv"; - version = "0.1.0"; - cargoLock.lockFile = ./Cargo.lock; - src = pkgs.lib.cleanSource ./.; - nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = [ pkgs.openssl ]; - doCheck = false; - }; - }; + in + { + devShells.default = pkgs.mkShell { + packages = [ + pkgs.rustc + pkgs.cargo + pkgs.rustfmt + pkgs.rust-analyzer + ]; + }; + packages.default = pkgs.rustPlatform.buildRustPackage { + pname = "mkv"; + version = "0.1.0"; + cargoLock.lockFile = ./Cargo.lock; + src = pkgs.lib.cleanSource ./.; + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.openssl ] ++ darwinBuildInputs; + doCheck = false; + }; + } + ); }