public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

androidStudioPackages.*: Remove the "-wrapper" suffix from name

Browse Source 
This causes problems when parsing the name attribute, e.g. for Repology
and parseDrvName. I've added "-unwrapped" to the derivation with the
downloaded content to keep it easier to differentiate between the two.
This commit is contained in:
Michael Weiss 2019-09-04 19:10:00 +02:00
parent 6beabe7d2c
commit ef2328331c
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/android-studio/common.nix
View File

@ -40,7 +40,7 @@
let let
drvName = "android-studio-${channel}-${version}"; drvName = "android-studio-${channel}-${version}";
androidStudio = stdenv.mkDerivation { androidStudio = stdenv.mkDerivation {
name = drvName; name = "${drvName}-unwrapped";
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.tar.gz"; 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 ]; multiPkgs = pkgs: [ pkgs.ncurses5 ];
}; };
in runCommand in runCommand
"${drvName}-wrapper" drvName
{ {
startScript = '' startScript = ''
#!${bash}/bin/bash #!${bash}/bin/bash