From de43cdd355e2c30d15869b62f5965b2462438acc Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Mon, 28 Mar 2022 22:23:29 +0200 Subject: [PATCH] element-desktop: remove gcc references --- .../networking/instant-messengers/element/keytar/default.nix | 5 ++++- .../networking/instant-messengers/element/seshat/default.nix | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 292b0dfa075d..9d46657e0ab5 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage +{ lib, stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage, removeReferencesTo , fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }: let @@ -51,6 +51,9 @@ in stdenv.mkDerivation rec { mkdir -p $out cp -r ./!(build) $out install -D -t $out/build/Release build/Release/keytar.node + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $out/build/Release/keytar.node runHook postInstall ''; + + disallowedReferences = [ stdenv.cc.cc ]; } diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index 5017f8531179..3c4ac2f52ae1 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps, removeReferencesTo }: let pinData = lib.importJSON ./pin.json; @@ -48,8 +48,11 @@ in rustPlatform.buildRustPackage rec { rm -rf native/!(index.node) rm -rf node_modules $HOME cp -r . $out + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $out/native/index.node runHook postInstall ''; + disallowedReferences = [ stdenv.cc.cc ]; + cargoSha256 = pinData.cargoHash; }