Unverified Commit 913611aa authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #314388 from NixOS/backport-314352-to-release-24.05 

[Backport release-24.05] lemmy-server: fix darwin build
parents 03309929 15f3844c

pkgs/servers/web-apps/lemmy/server.nix

+2 −1
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -25849,7 +25849,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 {