Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions nix/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,14 @@ let

platforms = {
web = import ./platforms/web.nix { inherit pkgs pinnedFlutter; };
linux = import ./platforms/linux.nix { inherit pkgs stdenv lib; };
linux = import ./platforms/linux.nix {
inherit
pkgs
pinnedFlutter
stdenv
lib
;
};
apk = import ./platforms/apk.nix {
inherit
pkgs
Expand All @@ -65,9 +72,16 @@ let
};

in
pinnedFlutter.buildFlutterApplication (
(pinnedFlutter.buildFlutterApplication (
head
// lib.optionalAttrs (targetFlutterPlatform == "linux") platforms.linux
// lib.optionalAttrs (targetFlutterPlatform == "web") platforms.web
// lib.optionalAttrs (targetFlutterPlatform == "apk") platforms.apk
)
)).overrideAttrs
(old: {
# extraIncludes = break [ pkgs.fribidi.dev ];
# flutterBuildFlags = [
# "--cmake-args"
# "-CXXFLAGS=\"-I${pkgs.fribidi.dev}/include\""
# ];
})
17 changes: 16 additions & 1 deletion nix/platforms/linux.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
pkgs,
pinnedFlutter,
stdenv,
lib,
...
Expand All @@ -9,17 +10,31 @@ let
pkgs.libgbm
pkgs.libdrm
];
vodozemac-wasm = pkgs.callPackage ../vodozemac { flutter = pinnedFlutter; };
in
{
nativeBuildInputs = with pkgs; [
imagemagick
copyDesktopItems
webkitgtk_4_1
rustup
];

runtimeDependencies = with pkgs; [ pulseaudio ];
buildInputs = [ vodozemac-wasm ];

runtimeDependencies = with pkgs; [
pulseaudio
vodozemac-wasm
];

env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}";
NIX_LD = lib.fileContents "${stdenv.cc}/nix-support/dynamic-linker";

env.CPATH = "${pkgs.fribidi.dev}/include/fribidi";

shellHook = ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:./build/linux/x64/debug/bundle/lib/"
'';

desktopItems = [
(pkgs.makeDesktopItem {
Expand Down
Loading