Merge pull request #27320 from jtojnar/fix/unbreak-polari

polari: unbreak

authored by Frederik Rietdijk and committed by GitHub 8fcb0703 fdd07f62

+5 -6
+1 -1
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
··· 39 39 targetDirs=( "${prefix}/bin" "${prefix}/libexec" ) 40 40 for targetDir in "${targetDirs[@]}"; do 41 41 if [[ -d "${targetDir}" ]]; then 42 - find "${targetDir}" -type f -executable -print0 \ 42 + find -L "${targetDir}" -type f -executable -print0 \ 43 43 | while IFS= read -r -d '' file; do 44 44 echo "Wrapping program ${file}" 45 45 wrapProgram "${file}" "${gappsWrapperArgs[@]}"
+4 -5
pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
··· 1 1 { stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme 2 2 , telepathy_glib, gjs, itstool, telepathy_idle, libxml2 3 3 , pkgconfig, gtk3, glib, librsvg, libsecret, libsoup 4 - , gnome3, wrapGAppsHook }: 4 + , gnome3, wrapGAppsHook, telepathy_logger }: 5 5 6 6 stdenv.mkDerivation rec { 7 7 inherit (import ./src.nix fetchurl) name src; 8 8 9 - propagatedUserEnvPkgs = [ telepathy_idle ]; 9 + propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ]; 10 10 11 - buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook 12 - telepathy_glib gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ]; 11 + buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas 12 + telepathy_glib telepathy_logger gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ]; 13 13 14 14 enableParallelBuilding = true; 15 15 ··· 19 19 maintainers = gnome3.maintainers; 20 20 license = licenses.gpl2; 21 21 platforms = platforms.linux; 22 - broken = true; 23 22 }; 24 23 }