Merge pull request #47 from uchar-org/bugfix/pkg-config

Bugfix/pkg config

Author: sud0pacman

nix/package.nix

@@ -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
@@ -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\""
+    # ];
+  })

nix/platforms/linux.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  pinnedFlutter,
   stdenv,
   lib,
   ...
@@ -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 {