diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-21 00:02:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-21 00:02:13 +0000 |
commit | 2b20c287acaaac93da07ea4b1f777fe96f68a3f0 (patch) | |
tree | 54665eab92d00218dcf1142e40e6fb5f90273a33 /pkgs/build-support | |
parent | b2f85dbf28290f7f11ef31d04019da1df5ebde5d (diff) | |
parent | 272be73a8ff53ecf0d49586b9f2a4b60b06e561a (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/flutter/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index c109804680f3e..a0ed1211ed812 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -3,8 +3,10 @@ , stdenvNoCC , runCommand , makeWrapper +, wrapGAppsHook , llvmPackages_13 , cacert +, glib , flutter , jq }: @@ -68,8 +70,12 @@ let deps flutter jq + glib + wrapGAppsHook ] ++ nativeBuildInputs; + dontWrapGApps = true; + preUnpack = '' ${lib.optionalString (!autoDepsList) '' if ! { [ '${lib.boolToString (depsListFile != null)}' = 'true' ] ${lib.optionalString (depsListFile != null) "&& cmp -s <(jq -Sc . '${depsListFile}') <(jq -Sc . '${finalAttrs.passthru.depsListFile}')"}; }; then @@ -144,6 +150,7 @@ let for f in "$out"/bin/*; do wrapProgram "$f" \ --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath finalAttrs.runtimeDependencies}' \ + ''${gappsWrapperArgs[@]} \ ${extraWrapProgramArgs} done |