treewide: concatStrings (intersperse ...) -> concatStringsSep ...
Update all usage of lib.concatStrings (lib.intersperse ...) to lib.concatStringsSep. This produces the same result as per https://github.com/NixOS/nixpkgs/pull/135843, however it yields a performance benefit on Nix versions that support the builtins.concatStringsSep primop.
This commit is contained in:
parent
a75378d396
commit
ca20a96b5f
@ -84,7 +84,7 @@ with builtins; buildDotnetPackage rec {
|
||||
# after loading. It is brought into plugins bin/ directory using
|
||||
# buildEnv in the plugin derivation. Wrapper below makes sure it
|
||||
# is found and does not pollute output path.
|
||||
binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins));
|
||||
binPaths = lib.concatStringsSep ":" (map (x: x + "/bin") plugins);
|
||||
|
||||
dynlibPath = lib.makeLibraryPath [ gtk2 ];
|
||||
|
||||
|
@ -24,7 +24,7 @@ in symlinkJoin {
|
||||
inherit license homepage;
|
||||
description = description
|
||||
+ " (with plugins: "
|
||||
+ lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins))
|
||||
+ lib.concatStringsSep ", " (map (x: ""+x.name) plugins)
|
||||
+ ")";
|
||||
};
|
||||
}
|
||||
|
@ -36,6 +36,6 @@ symlinkJoin {
|
||||
|
||||
description = thunar.meta.description + optionalString
|
||||
(0 != length thunarPlugins)
|
||||
" (with plugins: ${concatStrings (intersperse ", " (map (x: x.name) thunarPlugins))})";
|
||||
" (with plugins: ${concatStringsSep ", " (map (x: x.name) thunarPlugins)})";
|
||||
};
|
||||
}
|
||||
|
@ -133,7 +133,7 @@ let
|
||||
"--with-system-zlib"
|
||||
"--enable-static"
|
||||
"--enable-languages=${
|
||||
lib.concatStrings (lib.intersperse ","
|
||||
lib.concatStringsSep ","
|
||||
( lib.optional langC "c"
|
||||
++ lib.optional langCC "c++"
|
||||
++ lib.optional langD "d"
|
||||
@ -146,7 +146,6 @@ let
|
||||
++ lib.optionals crossDarwin [ "objc" "obj-c++" ]
|
||||
++ lib.optional langJit "jit"
|
||||
)
|
||||
)
|
||||
}"
|
||||
]
|
||||
|
||||
|
@ -31,7 +31,7 @@ stdenv.mkDerivation {
|
||||
inherit license homepage platforms maintainers;
|
||||
description = description
|
||||
+ " (with cores: "
|
||||
+ lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) cores))
|
||||
+ lib.concatStringsSep ", " (map (x: ""+x.name) cores)
|
||||
+ ")";
|
||||
};
|
||||
}
|
||||
|
@ -36,7 +36,7 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildCommand = with lib;
|
||||
concatStrings (intersperse "\n" (map exeWrapper backends));
|
||||
concatStringsSep "\n" (map exeWrapper backends);
|
||||
|
||||
# Will be faster to build the wrapper locally then to fetch it from a binary cache.
|
||||
preferLocalBuild = true;
|
||||
|
Loading…
Reference in New Issue
Block a user