pkgs/tools: stdenv.lib -> lib
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, libiconv, skktools }:
|
||||
{ lib, stdenv, fetchurl, libiconv, skktools }:
|
||||
|
||||
let
|
||||
# kana to kanji
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
|
||||
pname = "skk-dicts-unstable";
|
||||
version = "2017-10-26";
|
||||
srcs = [ small medium large edict assoc ];
|
||||
nativeBuildInputs = [ skktools ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
|
||||
nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
installPhase = ''
|
||||
@@ -66,8 +66,8 @@ stdenv.mkDerivation {
|
||||
dictionaries for the SKK Japanese input method.
|
||||
'';
|
||||
homepage = "https://github.com/skk-dev/dict";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ yuriaisaka ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }:
|
||||
|
||||
# Note (2017-10-24, yuriaisaka):
|
||||
# - Version 1.3.3 dates from Jul. 19, 2013.
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "skk-dev";
|
||||
repo = "skktools";
|
||||
rev = "skktools-${stdenv.lib.replaceStrings ["."] ["_"] version}";
|
||||
rev = "skktools-${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "1zway8jsm18279xq8zlpr84iqiw373x3v0ysay74n9bjqxbl234a";
|
||||
};
|
||||
# # See "12.2. Package naming"
|
||||
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
|
||||
input method.
|
||||
'';
|
||||
homepage = "https://github.com/skk-dev/skktools";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ yuriaisaka ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user