diff options
| author | Shea Levy <shea@shealevy.com> | 2018-05-22 16:42:02 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-05-22 16:42:02 -0400 |
| commit | 6da6accd303be776bb4e958da52046da86f9cb5c (patch) | |
| tree | d6cd95529b829d4fa8d592c8cd5209b34f68d90a /pkgs/development/mobile/androidenv | |
| parent | 74083c8cd71071739712213410a6733c98f0af33 (diff) | |
| download | nixpkgs-6da6accd303be776bb4e958da52046da86f9cb5c.tar nixpkgs-6da6accd303be776bb4e958da52046da86f9cb5c.tar.gz nixpkgs-6da6accd303be776bb4e958da52046da86f9cb5c.tar.bz2 nixpkgs-6da6accd303be776bb4e958da52046da86f9cb5c.tar.lz nixpkgs-6da6accd303be776bb4e958da52046da86f9cb5c.tar.xz nixpkgs-6da6accd303be776bb4e958da52046da86f9cb5c.tar.zst nixpkgs-6da6accd303be776bb4e958da52046da86f9cb5c.zip | |
treewide: Remove uses of builtins.toPath.
toPath has confusing semantics and is never necessary; it can always either just be omitted or replaced by pre-concatenating `/.`. It has been marked as "!!! obsolete?" for more than 10 years in a C++ comment, hopefully removing it will let us properly deprecate and, eventually, remove it.
Diffstat (limited to 'pkgs/development/mobile/androidenv')
| -rw-r--r-- | pkgs/development/mobile/androidenv/androidndk.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 78e278be237..1c0f75215e7 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { patch -p1 \ --no-backup-if-mismatch \ - -d $out/libexec/${name} < ${ ./. + builtins.toPath ("/make_standalone_toolchain.py_" + "${version}" + ".patch") } + -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_${version}.patch" } wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" '' } |