treewide: stdenv.lib -> lib
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
"load_average" "memory" "volume" "wifi" ]
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
let
|
||||
perlscripts = [ "battery" "cpu_usage" "openvpn" "temperature" ];
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ fetchFromGitHub, fetchpatch, stdenv, autoreconfHook, pkg-config }:
|
||||
{ fetchFromGitHub, fetchpatch, lib, stdenv, autoreconfHook, pkg-config }:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "i3blocks";
|
||||
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
# https://github.com/NixOS/nixpkgs/issues/7957
|
||||
doCheck = false; # stdenv.hostPlatform.system == "x86_64-linux";
|
||||
|
||||
checkPhase = stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux")
|
||||
checkPhase = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux")
|
||||
''
|
||||
(cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output)
|
||||
! grep -q '^not ok' testcases/latest/complete-run.log
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, vim, makeWrapper, jq, rofi, xrandr, xdotool, i3, gawk, libnotify }:
|
||||
|
||||
let
|
||||
path = stdenv.lib.makeBinPath [ vim jq rofi xrandr xdotool i3 gawk libnotify ];
|
||||
path = lib.makeBinPath [ vim jq rofi xrandr xdotool i3 gawk libnotify ];
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
|
||||
makeWrapperArgs = [
|
||||
# LC_TIME != C results in locale.Error: unsupported locale setting
|
||||
"--set" "LC_TIME" "C"
|
||||
"--suffix" "LD_LIBRARY_PATH" ":" "${stdenv.lib.makeLibraryPath [ libpulseaudio ]}"
|
||||
"--suffix" "LD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ libpulseaudio ]}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ fetchurl, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
|
||||
{ fetchurl, lib, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "i3status-2.13";
|
||||
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
|
||||
description = "Generates a status line for i3bar, dzen2, xmobar or lemonbar";
|
||||
homepage = "https://i3wm.org";
|
||||
maintainers = [ ];
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user