Skip to content

Commit 1d5dcb8

Browse files
committed
element-desktop: remove darwin frameworks, already part
of stdenv
1 parent 64b85b8 commit 1d5dcb8

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

pkgs/by-name/el/element-desktop/keytar/default.nix

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
pkg-config,
99
libsecret,
1010
xcbuild,
11-
Security,
12-
AppKit,
1311
fetchNpmDeps,
1412
npmHooks,
1513
}:
@@ -36,12 +34,7 @@ stdenv.mkDerivation rec {
3634
npmHooks.npmConfigHook
3735
] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
3836

39-
buildInputs =
40-
lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ]
41-
++ lib.optionals stdenv.hostPlatform.isDarwin [
42-
Security
43-
AppKit
44-
];
37+
buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ];
4538

4639
npmDeps = fetchNpmDeps {
4740
inherit src;

pkgs/by-name/el/element-desktop/package.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
element-web,
1414
sqlcipher,
1515
callPackage,
16-
darwin,
1716
desktopToDarwinBundle,
1817
useKeytar ? true,
1918
# command line arguments which are always set
@@ -24,8 +23,8 @@ let
2423
pinData = import ./element-desktop-pin.nix;
2524
inherit (pinData.hashes) desktopSrcHash desktopYarnHash;
2625
executableName = "element-desktop";
27-
keytar = callPackage ./keytar { inherit (darwin.apple_sdk.frameworks) Security AppKit; };
28-
seshat = callPackage ./seshat { inherit (darwin.apple_sdk.frameworks) CoreServices; };
26+
keytar = callPackage ./keytar { };
27+
seshat = callPackage ./seshat { };
2928
electron = electron_33;
3029
in
3130
stdenv.mkDerivation (

pkgs/by-name/el/element-desktop/seshat/default.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
stdenv,
44
rustPlatform,
55
fetchFromGitHub,
6-
rust,
76
sqlcipher,
87
nodejs,
98
python3,
109
yarn,
1110
fixup-yarn-lock,
12-
CoreServices,
1311
fetchYarnDeps,
1412
removeReferencesTo,
1513
}:
@@ -37,7 +35,7 @@ rustPlatform.buildRustPackage rec {
3735
yarn
3836
fixup-yarn-lock
3937
];
40-
buildInputs = [ sqlcipher ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices;
38+
buildInputs = [ sqlcipher ];
4139

4240
npm_config_nodedir = nodejs;
4341

0 commit comments

Comments
 (0)