diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2019-01-26 21:35:18 +0100 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2019-01-26 21:35:18 +0100 |
| commit | 9130c1d592b74d52165b953f95ff8f6d1027632b (patch) | |
| tree | 13f89ec2e159c7114e783a052633165669a1c728 /pkgs/development/mobile | |
| parent | 4fb8bc8238aa0366d78bae6095676ef7e08c17b2 (diff) | |
| download | nixpkgs-9130c1d592b74d52165b953f95ff8f6d1027632b.tar nixpkgs-9130c1d592b74d52165b953f95ff8f6d1027632b.tar.gz nixpkgs-9130c1d592b74d52165b953f95ff8f6d1027632b.tar.bz2 nixpkgs-9130c1d592b74d52165b953f95ff8f6d1027632b.tar.lz nixpkgs-9130c1d592b74d52165b953f95ff8f6d1027632b.tar.xz nixpkgs-9130c1d592b74d52165b953f95ff8f6d1027632b.tar.zst nixpkgs-9130c1d592b74d52165b953f95ff8f6d1027632b.zip | |
androidsdk: fix missing fontconfig library reference when tools version 26.1.x is used
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/androidenv/tools/26.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix index ed1dfe3d263..0234c9f3d04 100644 --- a/pkgs/development/mobile/androidenv/tools/26.nix +++ b/pkgs/development/mobile/androidenv/tools/26.nix @@ -4,7 +4,7 @@ deployAndroidPackage { name = "androidsdk"; inherit os package; buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' |