fixes -- but no tls for some reason

This commit is contained in:
Joseph Hanson 2025-02-28 22:45:12 -06:00
parent 60fa032842
commit 3300dd0480
Signed by: jahanson
SSH key fingerprint: SHA256:vy6dKBECV522aPAwklFM3ReKAVB086rT3oWwiuiFG7o

View file

@ -1,35 +1,36 @@
{ {
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
wrapGAppsHook,
atk, atk,
bzip2, bzip2,
cacert,
cairo, cairo,
cargo-tauri,
darwin,
dbus, dbus,
desktop-file-utils,
fetchFromGitHub,
gdk-pixbuf, gdk-pixbuf,
glib, glib,
gtk3, gtk3,
lib,
libsoup_3, libsoup_3,
nodejs,
openssl, openssl,
pango, pango,
pkg-config,
pnpm_9,
rust-jemalloc-sys, rust-jemalloc-sys,
rustPlatform,
sqlite, sqlite,
webkitgtk,
xz,
zstd,
stdenv, stdenv,
darwin, turbo,
wayland, wayland,
webkitgtk_4_1, webkitgtk_4_1,
cacert, wrapGAppsHook,
cargo-tauri, xz,
desktop-file-utils, zstd,
nodejs,
pnpm_9,
}: let }: let
pnpm = pnpm_9; pnpm = pnpm_9;
webkitgtk = webkitgtk_4_1;
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "modrinth-app"; pname = "modrinth-app";
@ -61,7 +62,6 @@ in
cargo-tauri.hook cargo-tauri.hook
desktop-file-utils desktop-file-utils
nodejs nodejs
pkg-config
pnpm.configHook pnpm.configHook
]; ];
@ -105,14 +105,18 @@ in
]; ];
env = { env = {
OPENSSL_NO_VENDOR = true; # OPENSSL_NO_VENDOR = true;
ZSTD_SYS_USE_PKG_CONFIG = true; # ZSTD_SYS_USE_PKG_CONFIG = true;
TURBO_BINARY_PATH = lib.getExe turbo;
}; };
meta = { meta = {
description = "The Modrinth monorepo containing all code which powers Modrinth"; description = "The Modrinth monorepo containing all code which powers Modrinth";
homepage = "https://github.com/modrinth/code"; homepage = "https://github.com/modrinth/code";
license = lib.licenses.unfree; # FIXME: nix-init did not find a license license = with lib.licenses; [
gpl3Plus
unfreeRedistributable
];
maintainers = with lib.maintainers; []; maintainers = with lib.maintainers; [];
mainProgram = "modrinth-app"; mainProgram = "modrinth-app";
}; };