JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #314352 from ofalvai/ofalvai/fix-lemmy-darwin

Browse Source 
lemmy-server: fix darwin build
This commit is contained in:
Robert Scott 2024-05-24 22:08:20 +01:00 committed by GitHub
commit d920273f0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/servers/web-apps/lemmy/server.nix
View File

@ -6,6 +6,7 @@
, postgresql
, libiconv
, Security
, SystemConfiguration
, protobuf
, rustfmt
, nixosTests
@ -33,7 +34,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = pinData.serverCargoHash;
buildInputs = [ postgresql ]
++ lib.optionals stdenv.isDarwin [ libiconv Security ];
++ lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ];
# Using OPENSSL_NO_VENDOR is not an option on darwin
# As of version 0.10.35 rust-openssl looks for openssl on darwin

2
pkgs/top-level/all-packages.nix
View File

@ -25837,7 +25837,7 @@ with pkgs;
leafnode1 = callPackage ../servers/news/leafnode/1.nix { };
lemmy-server = callPackage ../servers/web-apps/lemmy/server.nix {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix {