public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
treewide: remove inherited stdenv.lib
This commit is contained in:
Sandro
2021-01-27 10:28:55 +01:00
committed by GitHub
parent 2ee93d61ad 3bbad8b041
commit ad97ca4e51
32 changed files with 37 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/qt-5/5.12/default.nix
View File

@@ -124,7 +124,7 @@ let
# to avoid cyclic dependencies between Qt modules.
mkDerivation =
import ../mkDerivation.nix
{ inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; }
{ inherit lib; inherit debug; wrapQtAppsHook = null; }
stdenvActual.mkDerivation;
}
{ inherit self srcs patches; };

6
pkgs/development/libraries/qt-5/5.14/default.nix
View File

@@ -123,12 +123,12 @@ let
import ../qtModule.nix
{
inherit perl;
inherit (stdenv) lib;
inherit lib;
# Use a variant of mkDerivation that does not include wrapQtApplications
# to avoid cyclic dependencies between Qt modules.
mkDerivation =
import ../mkDerivation.nix
{ inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; }
{ inherit lib; inherit debug; wrapQtAppsHook = null; }
stdenvActual.mkDerivation;
}
{ inherit self srcs patches; };
@@ -140,7 +140,7 @@ let
mkDerivationWith =
import ../mkDerivation.nix
{ inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; };
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
mkDerivation = mkDerivationWith stdenvActual.mkDerivation;

6
pkgs/development/libraries/qt-5/5.15/default.nix
View File

@@ -103,12 +103,12 @@ let
import ../qtModule.nix
{
inherit perl;
inherit (stdenv) lib;
inherit lib;
# Use a variant of mkDerivation that does not include wrapQtApplications
# to avoid cyclic dependencies between Qt modules.
mkDerivation =
import ../mkDerivation.nix
{ inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; }
{ inherit lib; inherit debug; wrapQtAppsHook = null; }
stdenvActual.mkDerivation;
}
{ inherit self srcs patches; };
@@ -120,7 +120,7 @@ let
mkDerivationWith =
import ../mkDerivation.nix
{ inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; };
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
mkDerivation = mkDerivationWith stdenvActual.mkDerivation;