pkgs/development/tools: stdenv.lib -> lib
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
# cannot use fetchpatch! All mutable patches (generated by GitHub or
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
# fails 8 out of 24 tests, problems when loading libc.so.6
|
||||
doCheck = stdenv.name == "stdenv-linux";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/NixOS/patchelf/blob/master/README";
|
||||
license = licenses.gpl3;
|
||||
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, fetchFromGitHub }:
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "patchelf-${version}";
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
# Drop test that fails on musl (?)
|
||||
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
substituteInPlace tests/Makefile.am \
|
||||
--replace "set-rpath-library.sh" ""
|
||||
'';
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/NixOS/patchelf/blob/master/README";
|
||||
license = licenses.gpl3;
|
||||
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
|
||||
|
||||
Reference in New Issue
Block a user