pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }:
|
||||
{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }:
|
||||
|
||||
assert interactive -> readline != null && ncurses != null;
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
let
|
||||
archiveVersion = import ./archive-version.nix stdenv.lib;
|
||||
archiveVersion = import ./archive-version.nix lib;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fuse, zlib }:
|
||||
{ lib, stdenv, fetchurl, fuse, zlib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "sqlar";
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
install -D -t $out/bin sqlar sqlarfs
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://sqlite.org/sqlar";
|
||||
description = "SQLite Archive utilities";
|
||||
license = licenses.bsd2;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, unzip, sqlite, tcl, Foundation }:
|
||||
{ lib, stdenv, fetchurl, unzip, sqlite, tcl, Foundation }:
|
||||
|
||||
let
|
||||
archiveVersion = import ./archive-version.nix stdenv.lib;
|
||||
archiveVersion = import ./archive-version.nix lib;
|
||||
mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "3.34.0";
|
||||
@@ -12,13 +12,13 @@ let
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ tcl ] ++ stdenv.lib.optional stdenv.isDarwin Foundation;
|
||||
buildInputs = [ tcl ] ++ lib.optional stdenv.isDarwin Foundation;
|
||||
|
||||
makeFlags = [ makeTarget ];
|
||||
|
||||
installPhase = "install -Dt $out/bin ${makeTarget}";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
inherit description homepage;
|
||||
downloadPage = http://sqlite.org/download.html;
|
||||
license = licenses.publicDomain;
|
||||
|
||||
Reference in New Issue
Block a user