Gittes-archive/ow-mod-man
2
0
Fork 0
mirror of https://github.com/ow-mods/ow-mod-man.git synced 2025-12-11 20:15:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NIX] Fix Nix Packages

Browse Source
This commit is contained in:
Ben C 2025-07-10 02:38:59 -04:00
parent 4a3e1eaa50
commit 60d57c66a3
No known key found for this signature in database
3 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nix/devShell.nix
View File

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
packages = with pkgs; [
pkg-config
gobject-introspection
@ -24,5 +25,7 @@
export GIO_EXTRA_MODULES="${pkgs.dconf.lib}/lib/gio/modules:${pkgs.glib-networking}/lib/gio/modules"
'';
env.PKG_CONFIG_PATH = with pkgs; "${glib.dev}/lib/pkgconfig:${libsoup_3.dev}/lib/pkgconfig:${webkitgtk_4_1.dev}/lib/pkgconfig:${at-spi2-atk.dev}/lib/pkgconfig:${gtk3.dev}/lib/pkgconfig:${gdk-pixbuf.dev}/lib/pkgconfig:${cairo.dev}/lib/pkgconfig:${pango.dev}/lib/pkgconfig:${harfbuzz.dev}/lib/pkgconfig";
env.PKG_CONFIG_PATH =
with pkgs;
"${glib.dev}/lib/pkgconfig:${libsoup_3.dev}/lib/pkgconfig:${webkitgtk_4_1.dev}/lib/pkgconfig:${at-spi2-atk.dev}/lib/pkgconfig:${gtk3.dev}/lib/pkgconfig:${gdk-pixbuf.dev}/lib/pkgconfig:${cairo.dev}/lib/pkgconfig:${pango.dev}/lib/pkgconfig:${harfbuzz.dev}/lib/pkgconfig";
}

40
nix/packages/owmods-cli.nix
View File

@ -2,7 +2,7 @@
lib,
pkg-config,
openssl,
libsoup,
libsoup_3,
installShellFiles,
rustPlatform,
makeWrapper,
@ -14,36 +14,35 @@ rustPlatform.buildRustPackage rec {
version = "0.15.1";
# Prevent unneeded rebuilds
src = with lib.fileset;
src =
with lib.fileset;
toSource {
root = ../.;
root = ../../.;
fileset = unions [
../.cargo
../owmods_gui
../owmods_cli
../owmods_core
../xtask
../Cargo.toml
../Cargo.lock
../../.cargo
../../owmods_gui
../../owmods_cli
../../owmods_core
../../xtask
../../Cargo.toml
../../Cargo.lock
];
};
cargoLock = {
lockFile = ../Cargo.lock;
lockFile = ../../Cargo.lock;
};
doCheck = false;
nativeBuildInputs =
[
pkg-config
installShellFiles
]
++ lib.optional wrapWithMono makeWrapper;
nativeBuildInputs = [
pkg-config
installShellFiles
] ++ lib.optional wrapWithMono makeWrapper;
buildInputs = [
openssl
libsoup
libsoup_3
];
buildAndTestSubdir = "owmods_cli";
@ -63,6 +62,9 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}";
mainProgram = "owmods";
license = licenses.gpl3;
maintainers = with maintainers; [bwc9876 locochoco];
maintainers = with maintainers; [
bwc9876
locochoco
];
};
}

22
nix/packages/owmods-gui.nix
View File

@ -25,20 +25,20 @@ rustPlatform.buildRustPackage rec {
# Prevent unneeded rebuilds
src = with lib.fileset;
toSource {
root = ../.;
root = ../../.;
fileset = unions [
../.cargo
../owmods_gui
../owmods_cli
../owmods_core
../xtask
../Cargo.toml
../Cargo.lock
../../.cargo
../../owmods_gui
../../owmods_cli
../../owmods_core
../../xtask
../../Cargo.toml
../../Cargo.lock
];
};
cargoLock = {
lockFile = ../Cargo.lock;
lockFile = ../../Cargo.lock;
};
buildFeatures = [
@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec {
postPatch = let
frontend = let
src = ../owmods_gui/frontend;
src = ../../owmods_gui/frontend;
in
buildNpmPackage {
inherit version VITE_VERSION_SUFFIX;
@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec {
inherit src;
packageJSON = ../owmods_gui/frontend/package.json;
packageJSON = ../../owmods_gui/frontend/package.json;
npmDeps = importNpmLock {
npmRoot = src;
};