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

treewide: remove redundant quotes

Browse Source
This commit is contained in:
volth
2019-08-13 21:52:01 +00:00
parent fe9c9f719d
commit 35d68ef143
293 changed files with 860 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/mobile/androidenv/compose-android-packages.nix
View File

@@ -79,14 +79,14 @@ rec {
platform-tools = import ./platform-tools.nix {
inherit deployAndroidPackage os autoPatchelfHook pkgs;
inherit (stdenv) lib;
package = packages.platform-tools."${platformToolsVersion}";
package = packages.platform-tools.${platformToolsVersion};
};
build-tools = map (version:
import ./build-tools.nix {
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686;
inherit (stdenv) lib;
package = packages.build-tools."${version}";
package = packages.build-tools.${version};
}
) buildToolsVersions;
@@ -98,20 +98,20 @@ rec {
emulator = import ./emulator.nix {
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686;
inherit (stdenv) lib;
package = packages.emulator."${emulatorVersion}"."${os}";
package = packages.emulator.${emulatorVersion}.${os};
};
platforms = map (version:
deployAndroidPackage {
inherit os;
package = packages.platforms."${version}";
package = packages.platforms.${version};
}
) platformVersions;
sources = map (version:
deployAndroidPackage {
inherit os;
package = packages.sources."${version}";
package = packages.sources.${version};
}
) platformVersions;
@@ -130,7 +130,7 @@ rec {
import ./lldb.nix {
inherit deployAndroidPackage os autoPatchelfHook pkgs;
inherit (stdenv) lib;
package = packages.lldb."${version}";
package = packages.lldb.${version};
}
) lldbVersions;
@@ -138,27 +138,27 @@ rec {
import ./cmake.nix {
inherit deployAndroidPackage os autoPatchelfHook pkgs;
inherit (stdenv) lib;
package = packages.cmake."${version}";
package = packages.cmake.${version};
}
) cmakeVersions;
ndk-bundle = import ./ndk-bundle {
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs platform-tools;
inherit (stdenv) lib;
package = packages.ndk-bundle."${ndkVersion}";
package = packages.ndk-bundle.${ndkVersion};
};
google-apis = map (version:
deployAndroidPackage {
inherit os;
package = addons.addons."${version}".google_apis;
package = addons.addons.${version}.google_apis;
}
) (builtins.filter (platformVersion: platformVersion < "26") platformVersions); # API level 26 and higher include Google APIs by default
google-tv-addons = map (version:
deployAndroidPackage {
inherit os;
package = addons.addons."${version}".google_tv_addon;
package = addons.addons.${version}.google_tv_addon;
}
) platformVersions;
@@ -226,10 +226,10 @@ rec {
# Link extras
${stdenv.lib.concatMapStrings (identifier:
let
path = addons.extras."${identifier}".path;
path = addons.extras.${identifier}.path;
addon = deployAndroidPackage {
inherit os;
package = addons.extras."${identifier}";
package = addons.extras.${identifier};
};
in
''

4
pkgs/development/mobile/androidenv/tools.nix
View File

@@ -19,8 +19,8 @@ if toolsVersion == "26.0.1" then import ./tools/26.nix {
};
} else if toolsVersion == "26.1.1" then import ./tools/26.nix {
inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall;
package = packages.tools."${toolsVersion}";
package = packages.tools.${toolsVersion};
} else import ./tools/25.nix {
inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall;
package = packages.tools."${toolsVersion}";
package = packages.tools.${toolsVersion};
}