From 757df4a1b42e13b93c849dd3b3866f426a11d1b4 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Sun, 10 Nov 2024 06:37:50 +0000 Subject: [PATCH] xcodes: move to by-name --- .../tools => by-name/xc}/xcodes/generated/default.nix | 0 .../xc}/xcodes/generated/workspace-state.json | 0 .../xcodes/default.nix => by-name/xc/xcodes/package.nix} | 9 --------- pkgs/top-level/all-packages.nix | 5 ----- 4 files changed, 14 deletions(-) rename pkgs/{development/tools => by-name/xc}/xcodes/generated/default.nix (100%) rename pkgs/{development/tools => by-name/xc}/xcodes/generated/workspace-state.json (100%) rename pkgs/{development/tools/xcodes/default.nix => by-name/xc/xcodes/package.nix} (89%) diff --git a/pkgs/development/tools/xcodes/generated/default.nix b/pkgs/by-name/xc/xcodes/generated/default.nix similarity index 100% rename from pkgs/development/tools/xcodes/generated/default.nix rename to pkgs/by-name/xc/xcodes/generated/default.nix diff --git a/pkgs/development/tools/xcodes/generated/workspace-state.json b/pkgs/by-name/xc/xcodes/generated/workspace-state.json similarity index 100% rename from pkgs/development/tools/xcodes/generated/workspace-state.json rename to pkgs/by-name/xc/xcodes/generated/workspace-state.json diff --git a/pkgs/development/tools/xcodes/default.nix b/pkgs/by-name/xc/xcodes/package.nix similarity index 89% rename from pkgs/development/tools/xcodes/default.nix rename to pkgs/by-name/xc/xcodes/package.nix index 3b92959d2f44..70e51dd73fb3 100644 --- a/pkgs/development/tools/xcodes/default.nix +++ b/pkgs/by-name/xc/xcodes/package.nix @@ -5,9 +5,6 @@ , swiftpm , swiftpm2nix , makeWrapper -, CryptoKit -, LocalAuthentication -, libcompression , aria2 }: let @@ -26,12 +23,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ swift swiftpm makeWrapper ]; - buildInputs = [ - CryptoKit - LocalAuthentication - libcompression - ]; - configurePhase = generated.configure; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3226511390c..209ab9b7a88b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2029,11 +2029,6 @@ with pkgs; xcodeenv = callPackage ../development/mobile/xcodeenv { }; - xcodes = swiftPackages.callPackage ../development/tools/xcodes { - inherit (swiftPackages.apple_sdk.frameworks) CryptoKit LocalAuthentication; - inherit (swiftPackages.apple_sdk) libcompression; - }; - gomobile = callPackage ../development/mobile/gomobile { }; titaniumenv = callPackage ../development/mobile/titaniumenv { };