From 2d24875fe4aa7f31d15acfc29b9aa5c45109f99d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 13 Dec 2023 20:49:31 +0000
Subject: [PATCH] package.nix: Avoid `${..}` for conditional strings

Using `+` is Nixpkgs standard ideom for this, and helps avoid needless
rebuilds somewhat.
---
 package.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/package.nix b/package.nix
index 0b5b512c7..0b2ff43b0 100644
--- a/package.nix
+++ b/package.nix
@@ -254,25 +254,25 @@ in {
 
   disallowedReferences = [ boost ];
 
-  preConfigure = lib.optionalString (doBuild && ! stdenv.hostPlatform.isStatic) ''
-    # Copy libboost_context so we don't get all of Boost in our closure.
-    # https://github.com/NixOS/nixpkgs/issues/45462
-    mkdir -p $out/lib
-    cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*,libboost_regex*} $out/lib
-    rm -f $out/lib/*.a
-    ${lib.optionalString stdenv.hostPlatform.isLinux ''
+  preConfigure = lib.optionalString (doBuild && ! stdenv.hostPlatform.isStatic) (
+    ''
+      # Copy libboost_context so we don't get all of Boost in our closure.
+      # https://github.com/NixOS/nixpkgs/issues/45462
+      mkdir -p $out/lib
+      cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*,libboost_regex*} $out/lib
+      rm -f $out/lib/*.a
+    '' + lib.optionalString stdenv.hostPlatform.isLinux ''
       chmod u+w $out/lib/*.so.*
       patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
-    ''}
-    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+    '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
       for LIB in $out/lib/*.dylib; do
         chmod u+w $LIB
         install_name_tool -id $LIB $LIB
         install_name_tool -delete_rpath ${boost}/lib/ $LIB || true
       done
       install_name_tool -change ${boost}/lib/libboost_system.dylib $out/lib/libboost_system.dylib $out/lib/libboost_thread.dylib
-    ''}
-  '';
+    ''
+  );
 
   configureFlags = [
     "--sysconfdir=/etc"