diff options
Diffstat (limited to 'pkgs/applications/networking')
5 files changed, 15 insertions, 17 deletions
diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index bd17e86d8980..9252b95a00c7 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3 , gtk3, gnome3, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,18 +15,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + pantheon.vala gobject-introspection meson ninja pkgconfig python3 - vala wrapGAppsHook ]; buildInputs = [ + pantheon.granite gnome3.libgee - granite gtk3 libsecret libsoup diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix index 150c47b9b50b..cff1bcc56b92 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { postPatch = '' # we do all patching from update.sh in preAutoreconf - echo "#!/bin/sh" > update.sh + echo "#!${stdenv.shell}" > update.sh ''; preAutoreconf = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix index 3e9ebf3fe93f..3c9157081d3d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp ./bin/telegram-cli $out/bin/telegram-wo-key cp ./tg-server.pub $out/ cat > $out/bin/telegram-cli <<EOF - #!${bash}/bin/sh + #!${stdenv.shell} $out/bin/telegram-wo-key -k $out/tg-server.pub "\$@" EOF chmod +x $out/bin/telegram-cli diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix index c5b329b5f0a0..46649c069111 100644 --- a/pkgs/applications/networking/transporter/default.nix +++ b/pkgs/applications/networking/transporter/default.nix @@ -3,9 +3,9 @@ , meson , ninja , pkgconfig -, granite -, vala_0_40 +, gtk3 , python3 +, pantheon , gnome3 , libxml2 , gettext @@ -31,24 +31,22 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ appstream-glib desktop-file-utils + pantheon.vala gettext gobject-introspection # For setup hook libxml2 meson ninja pkgconfig - vala_0_40 python3 wrapGAppsHook ]; - buildInputs = with gnome3; [ - defaultIconTheme # If I omit this there's no icons in KDE - glib - granite - gsettings-desktop-schemas + buildInputs = [ + pantheon.elementary-icon-theme + gnome3.libgee + pantheon.granite gtk3 - libgee magic-wormhole ]; @@ -59,8 +57,8 @@ in stdenv.mkDerivation rec { ''; postPatch = '' - chmod +x ./meson/post_install.py - patchShebangs ./meson/post_install.py + chmod +x meson/post_install.py + patchShebangs meson/post_install.py ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 3dba90f964f5..149e126d6e87 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, granite, gtk3 +{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 , gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk , libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }: |