diff options
| author | Felix Buehler <account@buehler.rocks> | 2023-02-06 21:49:02 +0100 |
|---|---|---|
| committer | Felix Buehler <account@buehler.rocks> | 2023-02-13 21:52:34 +0100 |
| commit | cdb39a86e0dd7cda3a057f4f4795485a5c9b9be5 (patch) | |
| tree | 1fef6e55f39dab2289b68b68972ee4c9b89520f7 /pkgs/os-specific | |
| parent | 7f610b4d3f6e6f695b1f5521862066c0ece79a5a (diff) | |
| download | nixpkgs-cdb39a86e0dd7cda3a057f4f4795485a5c9b9be5.tar nixpkgs-cdb39a86e0dd7cda3a057f4f4795485a5c9b9be5.tar.gz nixpkgs-cdb39a86e0dd7cda3a057f4f4795485a5c9b9be5.tar.bz2 nixpkgs-cdb39a86e0dd7cda3a057f4f4795485a5c9b9be5.tar.lz nixpkgs-cdb39a86e0dd7cda3a057f4f4795485a5c9b9be5.tar.xz nixpkgs-cdb39a86e0dd7cda3a057f4f4795485a5c9b9be5.tar.zst nixpkgs-cdb39a86e0dd7cda3a057f4f4795485a5c9b9be5.zip | |
treewide: use optionalString
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/musl/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pcmciautils/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/windows/wxMSW-2.8/default.nix | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index c8ed8283ab3..7a0fabf9d46 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -94,12 +94,11 @@ stdenv.mkDerivation rec { NIX_DONT_SET_RPATH = true; preBuild = '' - ${if (stdenv.targetPlatform.libc == "musl" && stdenv.targetPlatform.isx86_32) then + ${lib.optionalString (stdenv.targetPlatform.libc == "musl" && stdenv.targetPlatform.isx86_32) "# the -x c flag is required since the file extension confuses gcc # that detect the file as a linker script. $CC -x c -c ${stack_chk_fail_local_c} -o __stack_chk_fail_local.o $AR r libssp_nonshared.a __stack_chk_fail_local.o" - else "" } ''; diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index bca58bd808e..b5f9d8a0a2c 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { s,/etc/pcmcia,$out&,; " src/{startup.c,pcmcia-check-broken-cis.c} # fix-color */ '' - + (if firmware == [] then ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'' else "") - + (if configOpts == null then "" else "ln -sf ${configOpts} ./config/config.opts") + + (lib.optionalString (firmware == []) ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'') + + (lib.optionalString (configOpts != null) "ln -sf ${configOpts} ./config/config.opts") ; makeFlags = [ "LEX=flex" ]; diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index bf1e73f67b9..091897b6934 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { (if compat24 then "--enable-compat24" else "--disable-compat24") (if compat26 then "--enable-compat26" else "--disable-compat26") "--disable-precomp-headers" - (if unicode then "--enable-unicode" else "") + (lib.optionalString unicode "--enable-unicode") "--with-opengl" ]; |