summary refs log tree commit diff
path: root/pkgs/applications/networking/feedreaders
diff options
context:
space:
mode:
authorBen Siraphob <bensiraphob@gmail.com>2021-01-15 12:42:41 +0700
committerBen Siraphob <bensiraphob@gmail.com>2021-01-15 14:24:03 +0700
commit108bdac3d99b6d94d3740422af5945e510238304 (patch)
treedd91cf11f7c29bbd4542f5bdab986430025c02e2 /pkgs/applications/networking/feedreaders
parent2e34288f0d8cf01eea228c7dbc50af9589b885f3 (diff)
downloadnixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar
nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.gz
nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.bz2
nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.lz
nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.xz
nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.zst
nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.zip
pkgs/applications: stdenv.lib -> lib
Diffstat (limited to 'pkgs/applications/networking/feedreaders')
-rw-r--r--pkgs/applications/networking/feedreaders/canto-curses/default.nix8
-rw-r--r--pkgs/applications/networking/feedreaders/newsboat/default.nix16
-rw-r--r--pkgs/applications/networking/feedreaders/rsstail/default.nix2
3 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
index 80106085e1b..39d9aa90596 100644
--- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }:
+{ lib, stdenv, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }:
 
 python3Packages.buildPythonApplication rec {
   version = "0.9.9";
@@ -25,8 +25,8 @@ python3Packages.buildPythonApplication rec {
       and extensibility using the excellent Python programming language.
     '';
     homepage = "https://codezen.org/canto-ng/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.devhell ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.devhell ];
   };
 }
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index 448590fbf11..bec0a7b1c38 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     substituteInPlace Makefile --replace "|| true" ""
   ''
     # TODO: Check if that's still needed
-    + stdenv.lib.optionalString stdenv.isDarwin ''
+    + lib.optionalString stdenv.isDarwin ''
       # Allow other ncurses versions on Darwin
       substituteInPlace config.sh \
         --replace "ncurses5.4" "ncurses"
@@ -29,24 +29,24 @@ rustPlatform.buildRustPackage rec {
     pkg-config
     asciidoctor
     gettext
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ncurses ];
+  ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ncurses ];
 
   buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ];
+    ++ lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ];
 
   postBuild = ''
     make prefix="$out"
   '';
 
   # TODO: Check if that's still needed
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin " -Wno-error=format-security";
 
   # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set
   # these for all platforms, since upstream's gettext crate behavior might
   # change in the future.
-  GETTEXT_LIB_DIR = "${stdenv.lib.getLib gettext}/lib";
-  GETTEXT_INCLUDE_DIR = "${stdenv.lib.getDev gettext}/include";
-  GETTEXT_BIN_DIR = "${stdenv.lib.getBin gettext}/bin";
+  GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib";
+  GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include";
+  GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin";
 
   doCheck = true;
 
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec {
   postInstall = ''
     make prefix="$out" install
     cp -r contrib $out
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     for prog in $out/bin/*; do
       wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
     done
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index f83c9111755..ea1566cd697 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     owner = "flok99";
   };
 
-  buildInputs = [ libmrss ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
+  buildInputs = [ libmrss ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
   checkInputs = [ cppcheck ];
 
   postPatch = ''