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

pkgs/applications: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-15 14:24:03 +07:00
parent 2e34288f0d
commit 108bdac3d9
427 changed files with 1160 additions and 1154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/feedreaders/canto-curses/default.nix
+4 -4
View File
@@ -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 ];
};
}
pkgs/applications/networking/feedreaders/newsboat/default.nix
+8 -8
View File
@@ -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
pkgs/applications/networking/feedreaders/rsstail/default.nix
+1 -1
View File
@@ -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 = ''