Merge pull request #110912 from siraben/stdenv-lib-inherit

treewide: remove inherited stdenv.lib
2021-01-27 10:28:55 +01:00
parent 2ee93d61ad 3bbad8b041
commit ad97ca4e51
32 changed files with 37 additions and 52 deletions
@@ -1,5 +1,5 @@
 { abiCompat ? null,
-  stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages,
+  lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages,
  automake, autoconf, gettext, libiconv, libtool, intltool,
  freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge,
  libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
@@ -9,7 +9,7 @@
 }:

 let
-  inherit (stdenv) lib isDarwin;
+  inherit (stdenv) isDarwin;
  inherit (lib) overrideDerivation;

  malloc0ReturnsNullCrossFlag = lib.optional