diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-24 03:10:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-24 03:10:32 +0100 |
commit | 77f32f2f3c5d4ff04c3d62dd8d71f9c327a54f07 (patch) | |
tree | 1b844532c1fbe5d64f98e8cb1c5bd9235d053d26 /pkgs/tools | |
parent | 84408a6ad04be26e8862fa1aa4ecc5cb3230c795 (diff) | |
parent | 90f73381120f7ae9e0d5f0f6dc16cb141c658494 (diff) | |
download | nixlib-77f32f2f3c5d4ff04c3d62dd8d71f9c327a54f07.tar nixlib-77f32f2f3c5d4ff04c3d62dd8d71f9c327a54f07.tar.gz nixlib-77f32f2f3c5d4ff04c3d62dd8d71f9c327a54f07.tar.bz2 nixlib-77f32f2f3c5d4ff04c3d62dd8d71f9c327a54f07.tar.lz nixlib-77f32f2f3c5d4ff04c3d62dd8d71f9c327a54f07.tar.xz nixlib-77f32f2f3c5d4ff04c3d62dd8d71f9c327a54f07.tar.zst nixlib-77f32f2f3c5d4ff04c3d62dd8d71f9c327a54f07.zip |
Merge pull request #110628 from prusnak/stdenv-lib
treewide: stdenv.lib -> lib
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/graphics/metapixel/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/lxi-tools/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/source-highlight/default.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/graphics/metapixel/default.nix b/pkgs/tools/graphics/metapixel/default.nix index a97be7f809cd..8c9fef0cd484 100644 --- a/pkgs/tools/graphics/metapixel/default.nix +++ b/pkgs/tools/graphics/metapixel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpng, libjpeg, giflib, perl, pkg-config }: +{ lib, stdenv, fetchFromGitHub, libpng, libjpeg, giflib, perl, pkg-config }: stdenv.mkDerivation rec { pname = "metapixel"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp metapixel-sizesort $out/bin/metapixel-sizesort ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/schani/metapixel"; description = "Tool for generating photomosaics"; license = licenses.gpl2Only; diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix index 3f3e62fb8075..92ef7f688a5a 100644 --- a/pkgs/tools/networking/lxi-tools/default.nix +++ b/pkgs/tools/networking/lxi-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config , liblxi, readline, lua }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ liblxi readline lua ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for communicating with LXI compatible instruments"; longDescription = '' lxi-tools is a collection of open source software tools diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 3d3a0f8c50a6..2e60d2a31c0c 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { # source-highlight uses it's own binary to generate documentation. # During cross-compilation, that binary was built for the target # platform architecture, so it can't run on the build host. - patchPhase = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + patchPhase = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace Makefile.in --replace "src doc tests" "src tests" ''; |