diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-04 22:11:37 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-03-04 22:11:37 +0100 |
commit | a992d6867108fa317f461becc92a7f36a59bac61 (patch) | |
tree | e6f50286c73fe41d3d91a7cb16e3b0a7d772e527 /pkgs/development/mobile | |
parent | 030d3a188c53892e9940da1f4a86681bc124d609 (diff) | |
parent | 98207d2573f47d37cb33cb73375c4a720007d3e0 (diff) | |
download | nixpkgs-a992d6867108fa317f461becc92a7f36a59bac61.tar nixpkgs-a992d6867108fa317f461becc92a7f36a59bac61.tar.gz nixpkgs-a992d6867108fa317f461becc92a7f36a59bac61.tar.bz2 nixpkgs-a992d6867108fa317f461becc92a7f36a59bac61.tar.lz nixpkgs-a992d6867108fa317f461becc92a7f36a59bac61.tar.xz nixpkgs-a992d6867108fa317f461becc92a7f36a59bac61.tar.zst nixpkgs-a992d6867108fa317f461becc92a7f36a59bac61.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/mobile')
-rw-r--r-- | pkgs/development/mobile/androidenv/compose-android-packages.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index fd78fa9ac0f..5db3538563f 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -24,7 +24,8 @@ }: let - inherit (pkgs) stdenv lib fetchurl makeWrapper unzip; + inherit (pkgs) stdenv lib fetchurl; + inherit (pkgs.buildPackages) makeWrapper unzip; # Determine the Android os identifier from Nix's system identifier os = if stdenv.system == "x86_64-linux" then "linux" |