From 17c843c5c536e6f9266003956a8251a7882ecccc Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 27 Jun 2024 19:30:58 -0400
Subject: [PATCH] Fix more issues

---
 package.nix                |  5 +----
 packaging/dependencies.nix | 13 ++++++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/package.nix b/package.nix
index 28d7e788f..da3a069fa 100644
--- a/package.nix
+++ b/package.nix
@@ -207,10 +207,7 @@ in {
     libsodium
     openssl
     sqlite
-    (toml11.overrideAttrs (old: {
-      # TODO change in Nixpkgs, Windows works fine.
-      meta.platforms = lib.platforms.all;
-    }))
+    toml11
     xz
     ({ inherit readline editline; }.${readlineFlavor})
   ] ++ lib.optionals enableMarkdown [
diff --git a/packaging/dependencies.nix b/packaging/dependencies.nix
index b2349f02c..909a0a38e 100644
--- a/packaging/dependencies.nix
+++ b/packaging/dependencies.nix
@@ -10,6 +10,7 @@
   stdenv,
   versionSuffix,
 }:
+
 let
   inherit (pkgs) lib;
 
@@ -52,7 +53,7 @@ scope: {
     enableLargeConfig = true;
   };
 
-  # Hack until https://github.com/NixOS/nixpkgs/issues/45462 is fixed.
+  # TODO Hack until https://github.com/NixOS/nixpkgs/issues/45462 is fixed.
   boost = (pkgs.boost.override {
     extraB2Args = [
       "--with-container"
@@ -61,8 +62,8 @@ scope: {
     ];
   }).overrideAttrs (old: {
     # Need to remove `--with-*` to use `--with-libraries=...`
-    buildPhase = pkgs.lib.replaceStrings [ "--without-python" ] [ "" ] old.buildPhase;
-    installPhase = pkgs.lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase;
+    buildPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.buildPhase;
+    installPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase;
   });
 
   libgit2 = pkgs.libgit2.overrideAttrs (attrs: {
@@ -96,5 +97,11 @@ scope: {
     '';
   });
 
+  # TODO change in Nixpkgs, Windows works fine. First commit of
+  # https://github.com/NixOS/nixpkgs/pull/322977 backported will fix.
+  toml11 = pkgs.toml11.overrideAttrs (old: {
+    meta.platforms = lib.platforms.all;
+  });
+
   mkMesonDerivation = f: stdenv.mkDerivation (lib.extends localSourceLayer f);
 }