diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-08-05 17:49:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-05 17:49:47 +0200 |
commit | 8fcb0703634aae35501e0e21315fd18ae18da673 (patch) | |
tree | 1cd47784bb209c028426547ed1207c616f92fe74 /pkgs | |
parent | fdd07f62e8eb4e80b47172707ee7c8a0d7dbf428 (diff) | |
parent | ec6f8320f4070d82b89c44bc7f9b52484853ee98 (diff) | |
download | nixlib-8fcb0703634aae35501e0e21315fd18ae18da673.tar nixlib-8fcb0703634aae35501e0e21315fd18ae18da673.tar.gz nixlib-8fcb0703634aae35501e0e21315fd18ae18da673.tar.bz2 nixlib-8fcb0703634aae35501e0e21315fd18ae18da673.tar.lz nixlib-8fcb0703634aae35501e0e21315fd18ae18da673.tar.xz nixlib-8fcb0703634aae35501e0e21315fd18ae18da673.tar.zst nixlib-8fcb0703634aae35501e0e21315fd18ae18da673.zip |
Merge pull request #27320 from jtojnar/fix/unbreak-polari
polari: unbreak
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 2 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/3.22/apps/polari/default.nix | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 9891128a6231..79b8d5b73fa1 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -39,7 +39,7 @@ wrapGAppsHook() { targetDirs=( "${prefix}/bin" "${prefix}/libexec" ) for targetDir in "${targetDirs[@]}"; do if [[ -d "${targetDir}" ]]; then - find "${targetDir}" -type f -executable -print0 \ + find -L "${targetDir}" -type f -executable -print0 \ | while IFS= read -r -d '' file; do echo "Wrapping program ${file}" wrapProgram "${file}" "${gappsWrapperArgs[@]}" diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix index a827831c801c..f14a1ef3c47d 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix @@ -1,15 +1,15 @@ { stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme , telepathy_glib, gjs, itstool, telepathy_idle, libxml2 , pkgconfig, gtk3, glib, librsvg, libsecret, libsoup -, gnome3, wrapGAppsHook }: +, gnome3, wrapGAppsHook, telepathy_logger }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = [ telepathy_idle ]; + propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook - telepathy_glib gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ]; + buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas + telepathy_glib telepathy_logger gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ]; enableParallelBuilding = true; @@ -19,6 +19,5 @@ stdenv.mkDerivation rec { maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; - broken = true; }; } |