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

lib/strings: guard against an easy mistake 

This would catch the bad `fwknop` flags fixed in 580cab57e4,
during evaluation already.
This commit is contained in:
Vladimír Čunát 2018-08-12 10:17:08 +02:00
parent 50674becf6
commit fecb444e18
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/strings.nix
View File

@ -412,7 +412,9 @@ rec {
enableFeature false "shared" enableFeature false "shared"
=> "--disable-shared" => "--disable-shared"
*/ */
enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}"; enableFeature = enable: feat:
assert isString feat; # e.g. passing openssl instead of "openssl"
"--${if enable then "enable" else "disable"}-${feat}";
/* Create an --{enable-<feat>=<value>,disable-<feat>} string that can be passed to /* Create an --{enable-<feat>=<value>,disable-<feat>} string that can be passed to
standard GNU Autoconf scripts. standard GNU Autoconf scripts.
@ -434,7 +436,9 @@ rec {
withFeature false "shared" withFeature false "shared"
=> "--without-shared" => "--without-shared"
*/ */
withFeature = with_: feat: "--${if with_ then "with" else "without"}-${feat}"; withFeature = with_: feat:
assert isString feat; # e.g. passing openssl instead of "openssl"
"--${if with_ then "with" else "without"}-${feat}";
/* Create an --{with-<feat>=<value>,without-<feat>} string that can be passed to /* Create an --{with-<feat>=<value>,without-<feat>} string that can be passed to
standard GNU Autoconf scripts. standard GNU Autoconf scripts.