Revert "Install signal-desktop in macOS via nixpkgs (#861)"

This reverts commit 4561a84.
kachick · Oct 31, 2024 · 4f2e57b · 4f2e57b
1 parent ca9fbce
commit 4f2e57b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 35 deletions.
diff --git a/flake.nix b/flake.nix
@@ -207,42 +207,21 @@
             };
           };
 
-          x86-macOS =
-            let
-              system = "x86_64-darwin";
-            in
-            {
-              pkgs = nixpkgs.legacyPackages.${system};
-              extraSpecialArgs = {
-                homemade-pkgs = homemade-packages.${system};
-                edge-pkgs = import edge-nixpkgs {
-                  inherit system;
-                  config = {
-                    # Atleast required for following
-                    # signal-desktop: https://github.com/NixOS/nixpkgs/pull/348165/files#diff-05921dc46b537c59c8a76dfc3c3e9a3a1fd93345ee5bff8573aae36dedf719bcR49
-                    # android-studio: https://github.com/NixOS/nixpkgs/blob/3490095db7c455272ee96c1d99d424d029bdf576/pkgs/applications/editors/android-studio/common.nix#L281
-                    allowUnfree = true;
-                  };
-                };
-              };
+          x86-macOS = {
+            pkgs = nixpkgs.legacyPackages.x86_64-darwin;
+            extraSpecialArgs = {
+              homemade-pkgs = homemade-packages.x86_64-darwin;
+              edge-pkgs = edge-nixpkgs.legacyPackages.x86_64-darwin;
             };
+          };
 
-          aarch64-macOS =
-            let
-              system = "aarch64-darwin";
-            in
-            {
-              pkgs = nixpkgs.legacyPackages.${system};
-              extraSpecialArgs = {
-                homemade-pkgs = homemade-packages.${system};
-                edge-pkgs = import edge-nixpkgs {
-                  inherit system;
-                  config = {
-                    allowUnfree = true;
-                  };
-                };
-              };
+          aarch64-macOS = {
+            pkgs = nixpkgs.legacyPackages.aarch64-darwin;
+            extraSpecialArgs = {
+              homemade-pkgs = homemade-packages.aarch64-darwin;
+              edge-pkgs = edge-nixpkgs.legacyPackages.aarch64-darwin;
             };
+          };
         in
         {
           "kachick@desktop" = home-manager.lib.homeManagerConfiguration (

diff --git a/home-manager/darwin.nix b/home-manager/darwin.nix
@@ -55,8 +55,6 @@ lib.mkMerge [
 
         edge-pkgs.podman-desktop # Useable since https://github.com/NixOS/nixpkgs/pull/343648
 
-        edge-pkgs.signal-desktop # Useable since https://github.com/NixOS/nixpkgs/pull/348165
-
         homemade-pkgs.maccy
       ];
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,8 +55,6 @@ lib.mkMerge [ @@
             edge-pkgs.podman-desktop # Useable since https://github.com/NixOS/nixpkgs/pull/343648
-            edge-pkgs.signal-desktop # Useable since https://github.com/NixOS/nixpkgs/pull/348165
             homemade-pkgs.maccy
           ];
         };
@@ Expand Down @@