From ef2328331c97a37ebc95af22d21296284f5da451 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 4 Sep 2019 19:10:00 +0200 Subject: androidStudioPackages.*: Remove the "-wrapper" suffix from name 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. --- pkgs/applications/editors/android-studio/common.nix | 4 ++-- 1 file 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 -- cgit 1.4.1