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: cb8b71c6455b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ef7f4788c7e5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 13, 2020

  1. android-studio: Fix the license (unfree) 

    Android Studio states that it contains proprietary code!

(cherry picked from commit adcd8ba)
    @primeos
    primeos committed Apr 13, 2020
    Copy the full SHA
    ef7f478 View commit details
Showing with 8 additions and 1 deletion.
  1. +8 −1 pkgs/applications/editors/android-studio/common.nix
9 changes: 8 additions & 1 deletion pkgs/applications/editors/android-studio/common.nix
View file
Original file line number Diff line number Diff line change
@@ -187,7 +187,14 @@ in runCommand
homepage = if channel == "stable"
then https://developer.android.com/studio/index.html
else https://developer.android.com/studio/preview/index.html;
license = licenses.asl20;
license = with licenses; [ asl20 unfree ]; # The code is under Apache-2.0, but:
# If one selects Help -> Licenses in Android Studio, the dialog shows the following:
# "Android Studio includes proprietary code subject to separate license,
# including JetBrains CLion(R) (www.jetbrains.com/clion) and IntelliJ(R)
# IDEA Community Edition (www.jetbrains.com/idea)."
# Also: For actual development the Android SDK is required and the Google
# binaries are also distributed as proprietary software (unlike the
# source-code itself).
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ primeos ];
};