diff --git a/pkgs/by-name/cw/cwtch-ui/package.nix b/pkgs/by-name/cw/cwtch-ui/package.nix index 7a05aa76b53e..88bcf61439d5 100644 --- a/pkgs/by-name/cw/cwtch-ui/package.nix +++ b/pkgs/by-name/cw/cwtch-ui/package.nix @@ -4,12 +4,10 @@ flutter, lib, tor, - zenity, }: let runtimeBinDependencies = [ tor - zenity ]; in flutter.buildFlutterApplication rec { diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix index 861237e7d515..6b1bbedcbab5 100644 --- a/pkgs/by-name/fl/flclash/package.nix +++ b/pkgs/by-name/fl/flclash/package.nix @@ -7,7 +7,6 @@ buildGoModule, makeDesktopItem, copyDesktopItems, - zenity, wrapGAppsHook3, autoPatchelfHook, }: @@ -97,10 +96,6 @@ flutter324.buildFlutterApplication { install -Dm644 ./assets/images/icon.png $out/share/pixmaps/flclash.png ''; - extraWrapProgramArgs = '' - --prefix PATH : ${lib.makeBinPath [ zenity ]} - ''; - meta = { description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free"; homepage = "https://github.com/chen08209/FlClash"; diff --git a/pkgs/by-name/fl/fluffychat/package.nix b/pkgs/by-name/fl/fluffychat/package.nix index f3e0e4a0cfdc..482b8ddb5b0f 100644 --- a/pkgs/by-name/fl/fluffychat/package.nix +++ b/pkgs/by-name/fl/fluffychat/package.nix @@ -8,7 +8,6 @@ flutter324, pulseaudio, makeDesktopItem, - zenity, olm, targetFlutterPlatform ? "linux", @@ -64,8 +63,6 @@ flutter324.buildFlutterApplication ( runtimeDependencies = [ pulseaudio ]; - extraWrapProgramArgs = "--prefix PATH : ${zenity}/bin"; - env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}"; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix index 7682422e031c..fd0b8770e378 100644 --- a/pkgs/by-name/ma/mangayomi/package.nix +++ b/pkgs/by-name/ma/mangayomi/package.nix @@ -35,7 +35,6 @@ libvdpau, rustPlatform, stdenv, - zenity, copyDesktopItems, makeDesktopItem, replaceVars, @@ -157,12 +156,7 @@ flutter324.buildFlutterApplication { ''; extraWrapProgramArgs = '' - --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" \ - --prefix PATH : "${ - lib.makeBinPath [ - zenity - ] - }" + --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" ''; meta = { diff --git a/pkgs/by-name/qu/quickgui/package.nix b/pkgs/by-name/qu/quickgui/package.nix index 3bd968a1cb12..7a39f648cacf 100644 --- a/pkgs/by-name/qu/quickgui/package.nix +++ b/pkgs/by-name/qu/quickgui/package.nix @@ -5,7 +5,6 @@ lib, flutter, quickemu, - zenity, }: flutter.buildFlutterApplication rec { pname = "quickgui"; @@ -26,7 +25,6 @@ flutter.buildFlutterApplication rec { extraWrapProgramArgs = "--prefix PATH : ${ lib.makeBinPath [ quickemu - zenity ] }"; diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix index e462e932cca6..f07195160d43 100644 --- a/pkgs/development/compilers/dart/package-source-builders/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/default.nix @@ -1,6 +1,7 @@ { callPackage }: { + file_picker = callPackage ./file_picker { }; flutter_secure_storage_linux = callPackage ./flutter-secure-storage-linux { }; flutter_volume_controller = callPackage ./flutter_volume_controller { }; fvp = callPackage ./fvp { }; diff --git a/pkgs/development/compilers/dart/package-source-builders/file_picker/default.nix b/pkgs/development/compilers/dart/package-source-builders/file_picker/default.nix new file mode 100644 index 000000000000..11b541507e04 --- /dev/null +++ b/pkgs/development/compilers/dart/package-source-builders/file_picker/default.nix @@ -0,0 +1,25 @@ +{ + stdenv, + zenity, +}: + +{ version, src, ... }: + +stdenv.mkDerivation rec { + pname = "file_picker"; + inherit version src; + inherit (src) passthru; + + postPatch = '' + substituteInPlace lib/src/linux/file_picker_linux.dart \ + --replace-fail "isExecutableOnPath('zenity')" "'${zenity}/bin/zenity'" + ''; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; +}