diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-24 00:15:07 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-24 00:16:29 +0700 |
| commit | 2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4 (patch) | |
| tree | fd273f1e48a30237aa9b96342f6324757a4ca09f /pkgs/development/androidndk-pkgs | |
| parent | ec334a1b01c491faa3463c96717b71921dddef2c (diff) | |
| download | nixpkgs-2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4.tar nixpkgs-2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4.tar.gz nixpkgs-2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4.tar.bz2 nixpkgs-2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4.tar.lz nixpkgs-2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4.tar.xz nixpkgs-2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4.tar.zst nixpkgs-2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4.zip | |
pkgs/development: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/androidndk-pkgs')
| -rw-r--r-- | pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/androidndk-pkgs/default.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index 995789b8c1b..04dfbcbedf0 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , makeWrapper , runCommand, wrapBintoolsWith, wrapCCWith , buildAndroidndk, androidndk, targetAndroidndkPkgs @@ -48,7 +48,7 @@ let hostInfo = ndkInfoFun stdenv.hostPlatform; targetInfo = ndkInfoFun stdenv.targetPlatform; - prefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-"); + prefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-"); in rec { diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index 10819d49ed3..5f71304d385 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -1,4 +1,4 @@ -{ androidenv, buildPackages, pkgs, targetPackages +{ lib, androidenv, buildPackages, pkgs, targetPackages }: { @@ -17,6 +17,7 @@ }; in import ./androidndk-pkgs.nix { + inherit lib; inherit (buildPackages) makeWrapper; inherit (pkgs) @@ -46,6 +47,7 @@ }; in import ./androidndk-pkgs.nix { + inherit lib; inherit (buildPackages) makeWrapper; inherit (pkgs) |