From 1d5dcb8bed58e95529fcf97b3b0987e82f1b720a Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 19 Dec 2024 13:12:24 -0300 Subject: [PATCH] element-desktop: remove darwin frameworks, already part of stdenv --- pkgs/by-name/el/element-desktop/keytar/default.nix | 9 +-------- pkgs/by-name/el/element-desktop/package.nix | 5 ++--- pkgs/by-name/el/element-desktop/seshat/default.nix | 4 +--- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/el/element-desktop/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix index 993bbcd2068f..4b9411b8f75f 100644 --- a/pkgs/by-name/el/element-desktop/keytar/default.nix +++ b/pkgs/by-name/el/element-desktop/keytar/default.nix @@ -8,8 +8,6 @@ pkg-config, libsecret, xcbuild, - Security, - AppKit, fetchNpmDeps, npmHooks, }: @@ -36,12 +34,7 @@ stdenv.mkDerivation rec { npmHooks.npmConfigHook ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; - buildInputs = - lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - AppKit - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ]; npmDeps = fetchNpmDeps { inherit src; diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 1afb094d7e5a..f0f92cccb0df 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -13,7 +13,6 @@ element-web, sqlcipher, callPackage, - darwin, desktopToDarwinBundle, useKeytar ? true, # command line arguments which are always set @@ -24,8 +23,8 @@ let pinData = import ./element-desktop-pin.nix; inherit (pinData.hashes) desktopSrcHash desktopYarnHash; executableName = "element-desktop"; - keytar = callPackage ./keytar { inherit (darwin.apple_sdk.frameworks) Security AppKit; }; - seshat = callPackage ./seshat { inherit (darwin.apple_sdk.frameworks) CoreServices; }; + keytar = callPackage ./keytar { }; + seshat = callPackage ./seshat { }; electron = electron_33; in stdenv.mkDerivation ( diff --git a/pkgs/by-name/el/element-desktop/seshat/default.nix b/pkgs/by-name/el/element-desktop/seshat/default.nix index 800650ce5b66..5e3bb3f0aa07 100644 --- a/pkgs/by-name/el/element-desktop/seshat/default.nix +++ b/pkgs/by-name/el/element-desktop/seshat/default.nix @@ -3,13 +3,11 @@ stdenv, rustPlatform, fetchFromGitHub, - rust, sqlcipher, nodejs, python3, yarn, fixup-yarn-lock, - CoreServices, fetchYarnDeps, removeReferencesTo, }: @@ -37,7 +35,7 @@ rustPlatform.buildRustPackage rec { yarn fixup-yarn-lock ]; - buildInputs = [ sqlcipher ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; + buildInputs = [ sqlcipher ]; npm_config_nodedir = nodejs;