From 7fd5a33393a196d12769d5d10cd5972ac2d68d93 Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Mon, 14 Nov 2022 00:22:10 +1100
Subject: flutter: Move runtime libraries out of FHS using LD_LIBRARY_PATH

---
 pkgs/development/compilers/flutter/flutter.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'pkgs/development/compilers/flutter/flutter.nix')

diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index 9d53f4ba3a47e..680ea6d948881 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -130,15 +130,6 @@ let
         '')
         zlib
       ] ++ pkgs.lib.lists.optionals supportsLinuxDesktop [
-        atk
-        cairo
-        gdk-pixbuf
-        glib
-        gtk3
-        harfbuzz
-        libepoxy
-        pango
-        xorg.libX11
         xorg.libX11.dev
         xorg.xorgproto
       ]);
@@ -242,6 +233,17 @@ runCommandLocal drvName
             clang
           ])} \
         --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH_FOR_TARGET" \
+        --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath (lib.lists.optionals supportsLinuxDesktop [
+            atk
+            cairo
+            gdk-pixbuf
+            glib
+            gtk3
+            harfbuzz
+            libepoxy
+            pango
+            libX11
+          ])} \
         --add-flags --no-version-check
 
     makeWrapper ${fhsEnv}/bin/${drvName}-fhs-env $out/bin/${pname} \
-- 
cgit 1.4.1