diff options
| author | Shea Levy <shea@shealevy.com> | 2018-09-06 08:09:53 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-09-06 08:09:53 -0400 |
| commit | 18337f3ece325ac0b0b26d05e2ccbe5f6398c937 (patch) | |
| tree | 401b66e49052817f7042406b51a71e1597dbbf3e /pkgs/development/mobile/androidenv | |
| parent | 0af9072e74c9e70af62e828ba4fb21391df2e601 (diff) | |
| parent | 6da6accd303be776bb4e958da52046da86f9cb5c (diff) | |
| download | nixpkgs-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar nixpkgs-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.gz nixpkgs-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.bz2 nixpkgs-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.lz nixpkgs-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.xz nixpkgs-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.zst nixpkgs-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.zip | |
Merge branch 'no-toPath'
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 3ccdb237f89..b79741fca23 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -49,7 +49,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}" '' } |