public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
polari: unbreak
This commit is contained in:
Frederik Rietdijk 2017-08-05 17:49:47 +02:00 committed by GitHub
commit 8fcb070363
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
View File

@ -39,7 +39,7 @@ wrapGAppsHook() {
targetDirs=( "${prefix}/bin" "${prefix}/libexec" ) targetDirs=( "${prefix}/bin" "${prefix}/libexec" )
for targetDir in "${targetDirs[@]}"; do for targetDir in "${targetDirs[@]}"; do
if [[ -d "${targetDir}" ]]; then if [[ -d "${targetDir}" ]]; then
find "${targetDir}" -type f -executable -print0 \ find -L "${targetDir}" -type f -executable -print0 \
| while IFS= read -r -d '' file; do | while IFS= read -r -d '' file; do
echo "Wrapping program ${file}" echo "Wrapping program ${file}"
wrapProgram "${file}" "${gappsWrapperArgs[@]}" wrapProgram "${file}" "${gappsWrapperArgs[@]}"

9
pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme { stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
, telepathy_glib, gjs, itstool, telepathy_idle, libxml2 , telepathy_glib, gjs, itstool, telepathy_idle, libxml2
, pkgconfig, gtk3, glib, librsvg, libsecret, libsoup , pkgconfig, gtk3, glib, librsvg, libsecret, libsoup
, gnome3, wrapGAppsHook }: , gnome3, wrapGAppsHook, telepathy_logger }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; 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 buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas
telepathy_glib gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ]; telepathy_glib telepathy_logger gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -19,6 +19,5 @@ stdenv.mkDerivation rec {
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
broken = true;
}; };
} }