treewide: stdenv.lib -> lib
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript
|
||||
{ lib, stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript
|
||||
, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, nixosTests
|
||||
, gettext ? null, enableNls ? true, enableTiny ? false }:
|
||||
|
||||
assert enableNls -> (gettext != null);
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
let
|
||||
nixSyntaxHighlight = fetchFromGitHub {
|
||||
@@ -30,8 +30,8 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [
|
||||
"--sysconfdir=/etc"
|
||||
(stdenv.lib.enableFeature enableNls "nls")
|
||||
(stdenv.lib.enableFeature enableTiny "tiny")
|
||||
(lib.enableFeature enableNls "nls")
|
||||
(lib.enableFeature enableTiny "tiny")
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
|
||||
#!${stdenv.shell}
|
||||
set -o errexit
|
||||
PATH=${
|
||||
stdenv.lib.makeBinPath [
|
||||
lib.makeBinPath [
|
||||
common-updater-scripts
|
||||
git
|
||||
nixfmt
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, writeScript, nixosTests, common-updater-scripts
|
||||
{ lib, stdenv, fetchFromGitHub, writeScript, nixosTests, common-updater-scripts
|
||||
, coreutils, git, gnused, nix, nixfmt }:
|
||||
|
||||
let
|
||||
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
|
||||
#!${stdenv.shell}
|
||||
set -o errexit
|
||||
PATH=${
|
||||
stdenv.lib.makeBinPath [
|
||||
lib.makeBinPath [
|
||||
common-updater-scripts
|
||||
coreutils
|
||||
git
|
||||
@@ -51,8 +51,8 @@ in stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Improved Nano Syntax Highlighting Files";
|
||||
homepage = "https://github.com/scopatz/nanorc";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = with stdenv.lib.maintainers; [ nequissimus ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ nequissimus ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user