Merge pull request #6 from R-VdP/rust_flags_systemd

Using systemdMinimal takes care of other native build deps.
This commit is contained in:
Ramses 2023-02-10 17:00:02 +01:00 committed by GitHub
commit 42c2008170
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -125,7 +125,10 @@
env = [ env = [
{ {
name = "PKG_CONFIG_PATH"; name = "PKG_CONFIG_PATH";
value = pkgs.lib.makeSearchPath "lib/pkgconfig" [ pkgs.dbus.dev pkgs.systemd.dev ]; value = pkgs.lib.makeSearchPath "lib/pkgconfig" [
pkgs.dbus.dev
pkgs.systemdMinimal.dev
];
} }
{ {
name = "LIBCLANG_PATH"; name = "LIBCLANG_PATH";
@ -142,7 +145,13 @@
} }
{ {
name = "RUSTFLAGS"; name = "RUSTFLAGS";
value = "-L${pkgs.systemd}/lib -lsystemd -L${pkgs.lib.getLib pkgs.zstd}/lib -lzstd -L${pkgs.lib.getLib pkgs.libgcrypt}/lib -lgcrypt -L${pkgs.lib.getLib pkgs.libcap}/lib -lcap -lgcrypt -L${pkgs.lib.getLib pkgs.lz4}/lib -llz4 -L${pkgs.lib.getLib pkgs.lzma}/lib -llzma -L${pkgs.lib.getLib pkgs.libgpg-error}/lib -lgpg-error"; value =
let
getLib = pkg: "${pkgs.lib.getLib pkg}/lib";
in
pkgs.lib.concatStringsSep " " [
"-L${getLib pkgs.systemdMinimal} -lsystemd"
];
} }
{ {
name = "DEVSHELL_NO_MOTD"; name = "DEVSHELL_NO_MOTD";