Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fc323c26d031
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eeba5c8e0dbd
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 4, 2019

  1. [fix] android-studio: added certificate bundle to /etc/pki 

    This fixes Flutter SDK failing on flutter pub, due to missing certificates.
Flutter does not check /etc/ssl, and can only find them in /etc/pki.
    @cab404
    cab404 committed Nov 4, 2019
    Copy the full SHA
    d860623 View commit details

Commits on Nov 6, 2019

  1. Merge pull request #72777 from cab404/android-studio/flutter-tls-support 

    android-studio: Fixed Flutter "TLS Error" on flutter pub get
    @matthewbauer
    matthewbauer authored Nov 6, 2019
    Copy the full SHA
    eeba5c8 View commit details
Showing with 11 additions and 1 deletion.
  1. +11 −1 pkgs/applications/editors/android-studio/common.nix
12 changes: 11 additions & 1 deletion pkgs/applications/editors/android-studio/common.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
{ alsaLib
, bash
, buildFHSUserEnv
, cacert
, coreutils
, dbus
, expat
@@ -152,7 +153,16 @@ let
# environment is used as a work around for that.
fhsEnv = buildFHSUserEnv {
name = "${drvName}-fhs-env";
multiPkgs = pkgs: [ pkgs.ncurses5 ];
multiPkgs = pkgs: [
pkgs.ncurses5

# Flutter can only search for certs Fedora-way.
(runCommand "fedoracert" {}
''
mkdir -p $out/etc/pki/tls/
ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs
'')
];
};
in runCommand
drvName