diff options
Diffstat (limited to 'pkgs/applications/networking')
13 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 49bc93b80d2..7efdf7ed015 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ] ++ stdenv.lib.optional enableDirectFB [ directfb ]; - buildNativeInputs = [ pkgconfig bzip2 ]; + nativeBuildInputs = [ pkgconfig bzip2 ]; configureFlags = [ "--with-ssl" ] ++ stdenv.lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics" diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index c0175fc6a70..63760c94426 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { configureFlags = if sslSupport then "--with-ssl" else ""; buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl; - buildNativeInputs = [ ncurses ]; + nativeBuildInputs = [ ncurses ]; crossAttrs = { configureFlags = "--enable-widec" + diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index 4a46de14f9b..fe573559961 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs qca2 qoauth ]; - buildNativeInputs = [ gettext pkgconfig shared_desktop_ontologies ]; + nativeBuildInputs = [ gettext pkgconfig shared_desktop_ontologies ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 04e119afdb1..8882a4388b0 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex ]; - buildNativeInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig ]; configureFlags = "--enable-external-ortp --enable-external-mediastreamer"; diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index 66a18dbdfe9..715f0e5c2de 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { cp -r * $out/libexec/skype/ fullPath= - for i in $buildNativeInputs; do + for i in $nativeBuildInputs; do fullPath=$fullPath''${fullPath:+:}$i/lib done diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 25919875bd1..c7a0401f3ee 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0fk65f7q75z3wm5h4wad7g5sm2j6r8v2845b74ycl29br78ki2hf"; }; - buildNativeInputs = [pkgconfig libxslt]; + nativeBuildInputs = [pkgconfig libxslt]; buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]; configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 1e2ded5292a..c8c685196cd 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib telepathy_glib dbus_glib pidgin ]; - buildNativeInputs = [ pkgconfig libxslt ]; + nativeBuildInputs = [ pkgconfig libxslt ]; meta = { description = "A Telepathy connection manager based on libpurple"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index 70e6293c9a3..5c1c399ab49 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -20,7 +20,7 @@ let text_ui = [ ktp.telepathy_logger_qt qt_gstreamer telepathy_logger ]; }; - extraBuildNativeInputs = { + extraNativeBuildInputs = { telepathy_logger_qt = [ flex bison ]; }; @@ -37,7 +37,7 @@ let inherit sha256; }; - buildNativeInputs = [ gettext pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraBuildNativeInputs); + nativeBuildInputs = [ gettext pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs); buildInputs = [ kdelibs telepathy_qt ] ++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals ++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs); diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index a820e0f8a99..4dacdb9f1ed 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool ]; - buildNativeInputs = [ libxslt ]; + nativeBuildInputs = [ libxslt ]; configureFlags = "--enable-call"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 4d79f0c89d8..1b2081c4dd0 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -11,5 +11,5 @@ stdenv.mkDerivation rec { buildInputs = [ telepathy_glib ]; - buildNativeInputs = [ pkgconfig libxslt ]; + nativeBuildInputs = [ pkgconfig libxslt ]; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix index e8b120b9331..a60e207b752 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf"; }; - buildNativeInputs = [pkgconfigUpstream libxslt python]; + nativeBuildInputs = [pkgconfigUpstream libxslt python]; buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip]; meta = { diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 3c100282aa4..4300ac15c99 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls sqlite ]; - buildNativeInputs = [ libxslt pkgconfigUpstream ]; + nativeBuildInputs = [ libxslt pkgconfigUpstream ]; configureFlags = "--disable-avahi-tests"; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 09f85b9edfc..32b531528d0 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [] ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; buildInputs = stdenv.lib.optional enableACLs acl; - buildNativeInputs = [perl]; + nativeBuildInputs = [perl]; meta = { homepage = http://samba.anu.edu.au/rsync/; |