element-desktop: remove darwin frameworks, already part
of stdenv
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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 (
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user