diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 22:46:05 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 22:46:05 +0200 |
commit | 66bc7fc1b3e7a85a2cfde9bb121498a181d411a4 (patch) | |
tree | fa53c32dfef1265496170172a28a3c71bb32a655 /pkgs/applications/editors/android-studio/common.nix | |
parent | f9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (diff) | |
parent | cfe51be04f8b7c36fe9f71ca5835bd683ede087f (diff) | |
download | nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.gz nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.bz2 nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.lz nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.xz nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.zst nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors/android-studio/common.nix')
-rw-r--r-- | pkgs/applications/editors/android-studio/common.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 50a752b3eb96..0d406ad2d360 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -40,7 +40,7 @@ let drvName = "android-studio-${channel}-${version}"; androidStudio = stdenv.mkDerivation { - name = drvName; + name = "${drvName}-unwrapped"; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.tar.gz"; @@ -133,7 +133,7 @@ let multiPkgs = pkgs: [ pkgs.ncurses5 ]; }; in runCommand - "${drvName}-wrapper" + drvName { startScript = '' #!${bash}/bin/bash |