diff --git a/nix/apps/default.nix b/nix/apps/default.nix index 1279045e..84837cf1 100644 --- a/nix/apps/default.nix +++ b/nix/apps/default.nix @@ -26,7 +26,7 @@ in os.program = "${self'.packages.nixos-rebuild}/bin/nixos-rebuild"; } // lib.optionalAttrs pkgs.stdenv.isDarwin { - os.program = "${self'.packages.nix-darwin}/bin/darwin-rebuild"; + os.program = "${inputs'.darwin.packages.default}/bin/darwin-rebuild"; }; }; } diff --git a/nix/packages/default.nix b/nix/packages/default.nix index a9d714e9..2cdbc0c2 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -37,11 +37,6 @@ inherit (pkgs.darwin.apple_sdk.frameworks) Foundation; }; - nix-darwin = pkgs.callPackage ./nix-darwin.nix { - inherit nix; - inherit (inputs) darwin; - }; - } // pkgs.callPackages ./skk-jisyo.nix { }; }; } diff --git a/nix/packages/nix-darwin.nix b/nix/packages/nix-darwin.nix deleted file mode 100644 index 61c09291..00000000 --- a/nix/packages/nix-darwin.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, runCommand, darwin, nix }: - -let - # Create a nix-darwin configuration that includes almost nothing other than - # nix-darwin itself. - tinyConfig = { - nix.package = nix; - documentation.info.enable = false; - programs.bash.enable = false; - }; - - tinyDarwin = darwin.lib.darwinSystem { - inherit (stdenv.hostPlatform) system; - modules = [ tinyConfig ]; - }; - - tinySystem = tinyDarwin.system; -in -runCommand "nix-darwin" -{ - meta = { - description = "Command line tool for nix-darwin"; - longDescription = '' - Provides command line tools from nix-darwin. This package is mainly useful - for bootstrapping nix-darwin. - ''; - license = with lib.licenses; [ mit ]; - homepage = "https://github.com/LnL7/nix-darwin"; - platforms = lib.platforms.darwin; - }; -} '' - mkdir -p "$out/bin" "$out/share/man/man5" - ln -s "${tinySystem}/sw/bin/darwin-help" "$out/bin/darwin-help" - ln -s "${tinySystem}/sw/bin/darwin-option" "$out/bin/darwin-option" - ln -s "${tinySystem}/sw/bin/darwin-rebuild" "$out/bin/darwin-rebuild" - ln -s "${tinySystem}/sw/share/man/man5/configuration.nix.5" \ - "$out/share/man/man5/configuration.nix.5" -''