pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, zlib }:
|
||||
{ lib, stdenv, fetchurl, zlib }:
|
||||
|
||||
assert stdenv.hostPlatform == stdenv.buildPlatform -> zlib != null;
|
||||
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = ''mv "$out/bin" "$dev/bin"'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "The official reference implementation for the PNG file format";
|
||||
homepage = "http://www.libpng.org/pub/png/libpng.html";
|
||||
license = licenses.libpng;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, zlib, apngSupport ? true }:
|
||||
{ lib, stdenv, fetchurl, zlib, apngSupport ? true }:
|
||||
|
||||
assert zlib != null;
|
||||
|
||||
@@ -8,7 +8,7 @@ let
|
||||
url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
|
||||
sha256 = "1dh0250mw9b2hx7cdmnb2blk7ddl49n6vx8zz7jdmiwxy38v4fw2";
|
||||
};
|
||||
whenPatched = stdenv.lib.optionalString apngSupport;
|
||||
whenPatched = lib.optionalString apngSupport;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "libpng" + whenPatched "-apng" + "-${version}";
|
||||
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
passthru = { inherit zlib; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch";
|
||||
homepage = "http://www.libpng.org/pub/png/libpng.html";
|
||||
license = licenses.libpng2;
|
||||
|
||||
Reference in New Issue
Block a user