colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

fractal-nixified: get libspa crate to build

Browse Source
This commit is contained in:
Colin
2023-09-30 20:19:28 +00:00
parent ce9b30767f
commit 1c5e2843a1
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/additional/fractal-nixified/default.nix
View File

@@ -12,13 +12,11 @@
{ pkgs { pkgs
, buildPackages , buildPackages
, clang
, dbus-glib , dbus-glib
, glib , glib
, gst_all_1 , gst_all_1
, gtk4 , gtk4
, libadwaita , libadwaita
, libclang
, libshumate , libshumate
, pipewire , pipewire
, pkg-config , pkg-config
@@ -100,26 +98,31 @@ let
buildInputs = [ libshumate ]; buildInputs = [ libshumate ];
}; };
libspa-sys = attrs: attrs // { libspa-sys = attrs: attrs // {
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
buildInputs = [ pipewire ];
# bindgenHook does the equivalent of this:
# preConfigure = (attrs.preConfigure or "") + ''
# # export BINDGEN_EXTRA_CLANG_ARGS="$NIX_CFLAGS_COMPILE"
# export BINDGEN_EXTRA_CLANG_ARGS="$(< ${clang}/nix-support/cc-cflags) $(< ${clang}/nix-support/libc-cflags) $(< ${clang}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE"
# '';
# LIBCLANG_PATH = "${buildPackages.llvmPackages.libclang.lib}/lib";
};
libspa = attrs: attrs // {
# not sure why the non-sys version of this crate needs pkg-config??
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ pipewire ]; buildInputs = [ pipewire ];
# alternative to this is add `rustPlatform.bindgenHook` to nativeBuildInputs.
# i'm just copying the logic from build-support/rust/hooks/rust-bindgen-hook.sh anyway
preConfigure = (attrs.preConfigure or "") + ''
# export BINDGEN_EXTRA_CLANG_ARGS="$NIX_CFLAGS_COMPILE"
export BINDGEN_EXTRA_CLANG_ARGS="$(< ${clang}/nix-support/cc-cflags) $(< ${clang}/nix-support/libc-cflags) $(< ${clang}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE"
'';
LIBCLANG_PATH = "${buildPackages.llvmPackages.libclang.lib}/lib";
}; };
pipewire-sys = attrs: attrs // { pipewire-sys = attrs: attrs // {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
buildInputs = [ pipewire ]; buildInputs = [ pipewire ];
# alternative to this is add `rustPlatform.bindgenHook` to nativeBuildInputs.
# i'm just copying the logic from build-support/rust/hooks/rust-bindgen-hook.sh anyway # bindgenHook does the equivalent of this:
preConfigure = (attrs.preConfigure or "") + '' # preConfigure = (attrs.preConfigure or "") + ''
# export BINDGEN_EXTRA_CLANG_ARGS="$NIX_CFLAGS_COMPILE" # # export BINDGEN_EXTRA_CLANG_ARGS="$NIX_CFLAGS_COMPILE"
export BINDGEN_EXTRA_CLANG_ARGS="$(< ${clang}/nix-support/cc-cflags) $(< ${clang}/nix-support/libc-cflags) $(< ${clang}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" # export BINDGEN_EXTRA_CLANG_ARGS="$(< ${clang}/nix-support/cc-cflags) $(< ${clang}/nix-support/libc-cflags) $(< ${clang}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE"
''; # '';
LIBCLANG_PATH = "${buildPackages.llvmPackages.libclang.lib}/lib"; # LIBCLANG_PATH = "${buildPackages.llvmPackages.libclang.lib}/lib";
}; };
# js_int = attrs: attrs // { # js_int = attrs: attrs // {
# features = attrs.features ++ [ "serde" "std" ]; # features = attrs.features ++ [ "serde" "std" ];