diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-19 17:14:52 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-19 17:14:52 +0100 |
| commit | f4d4283e3992c3f559831b1c030cd1fda6d45f98 (patch) | |
| tree | c2cc63060849298d9a8e7a329010bb0fc4abb219 /nixpkgs/pkgs/servers/matrix-synapse | |
| parent | dac53cd746c10feddd48d4a1981235a653d7d32a (diff) | |
| parent | 0ace63bed8f561e4cc5b1c8fa5fee6be61fbcf8b (diff) | |
| download | nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.gz nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.bz2 nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.lz nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.xz nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.zst nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into HEAD
Diffstat (limited to 'nixpkgs/pkgs/servers/matrix-synapse')
| -rw-r--r-- | nixpkgs/pkgs/servers/matrix-synapse/default.nix | 3 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 4b7c6d21f30d..ef8ff520c072 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , python3 , openssl +, libiconv , cargo , rustPlatform , rustc @@ -57,6 +58,8 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ openssl + ] ++ lib.optionals stdenv.isDarwin [ + libiconv ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix index 6113bd6ff417..f784036075c8 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix @@ -59,7 +59,7 @@ mkYarnPackage rec { buildPhase = '' runHook preBuild cd deps/${pname} - napi build --target ${stdenv.targetPlatform.rust.rustcTargetSpec} --dts ../src/libRs.d.ts --release ./lib + napi build --target ${stdenv.hostPlatform.rust.rustcTargetSpec} --dts ../src/libRs.d.ts --release ./lib yarn run build:app:fix-defs yarn run build:app yarn run build:web |