diff options
| author | Artturi <Artturin@artturin.com> | 2022-12-15 23:46:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-15 23:46:51 +0200 |
| commit | f9b2c36a7fecf2aec209e0ac755d5338a89c1fcd (patch) | |
| tree | 279a5295249f5c92650f393eb70f3851ce86cc5f /pkgs/development/mobile | |
| parent | a3a96a371af70703bfb7310e333da71cc099ccc2 (diff) | |
| parent | 05a2dfd6744cdc6ab0b57f8ab866cc686b05f519 (diff) | |
| download | nixlib-f9b2c36a7fecf2aec209e0ac755d5338a89c1fcd.tar nixlib-f9b2c36a7fecf2aec209e0ac755d5338a89c1fcd.tar.gz nixlib-f9b2c36a7fecf2aec209e0ac755d5338a89c1fcd.tar.bz2 nixlib-f9b2c36a7fecf2aec209e0ac755d5338a89c1fcd.tar.lz nixlib-f9b2c36a7fecf2aec209e0ac755d5338a89c1fcd.tar.xz nixlib-f9b2c36a7fecf2aec209e0ac755d5338a89c1fcd.tar.zst nixlib-f9b2c36a7fecf2aec209e0ac755d5338a89c1fcd.zip | |
Merge pull request #205701 from Artturin/deprecatereplacechars
lib.replaceChars: warn about being a deprecated alias
Diffstat (limited to 'pkgs/development/mobile')
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 6f4b32b486ba..7e34c34607eb 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -16,7 +16,7 @@ let extraArgs = removeAttrs args ([ "name" ] ++ builtins.attrNames androidSdkFormalArgs); in stdenv.mkDerivation ({ - name = lib.replaceChars [" "] [""] name; # Android APKs may contain white spaces in their names, but Nix store paths cannot + name = lib.replaceStrings [" "] [""] name; # Android APKs may contain white spaces in their names, but Nix store paths cannot ANDROID_HOME = "${androidsdk}/libexec/android-sdk"; buildInputs = [ jdk ant ]; buildPhase = '' diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 82a264e702de..e4c3062cf531 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -34,7 +34,7 @@ let extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ]; in stdenv.mkDerivation ({ - name = lib.replaceChars [" "] [""] name; + name = lib.replaceStrings [" "] [""] name; buildInputs = [ nodejs titanium alloy python which file jdk ]; diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index ae8416c8d769..4bef0ba2db0e 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -53,7 +53,7 @@ let extraArgs = removeAttrs args ([ "name" "scheme" "xcodeFlags" "release" "certificateFile" "certificatePassword" "provisioningProfile" "signMethod" "generateIPA" "generateXCArchive" "enableWirelessDistribution" "installURL" "bundleId" "version" ] ++ builtins.attrNames xcodewrapperFormalArgs); in stdenv.mkDerivation ({ - name = lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed + name = lib.replaceStrings [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed buildPhase = '' # Be sure that the Xcode wrapper has priority over everything else. # When using buildInputs this does not seem to be the case. diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index ea0502eb9818..ca6806d43b99 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -9,7 +9,7 @@ let xcodewrapper = composeXcodeWrapper xcodewrapperArgs; in stdenv.mkDerivation { - name = lib.replaceChars [" "] [""] name; + name = lib.replaceStrings [" "] [""] name; buildCommand = '' mkdir -p $out/bin cat > $out/bin/run-test-simulator << "EOF" |