Merge branch 'main' into darwin/fix-dyld

cachix · May 19, 2023 · 9e17e98 · 9e17e98
2 parents 11eaa6b + 828b46c
commit 9e17e98
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/devenv.nix b/devenv.nix
@@ -4,6 +4,7 @@
   packages = [
     (import ./src/devenv.nix { inherit pkgs; nix = inputs.nix; })
     pkgs.cairo
+    pkgs.xorg.libxcb
     pkgs.yaml2json
   ];
 

diff --git a/examples/ruby/Gemfile.lock b/examples/ruby/Gemfile.lock
@@ -97,6 +97,8 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
+    nokogiri (1.14.1-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.14.1-x86_64-linux)
       racc (~> 1.4)
     puma (6.0.1)
@@ -142,6 +144,7 @@ GEM
     zeitwerk (2.6.6)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-linux
 
 DEPENDENCIES

diff --git a/examples/ruby/devenv.nix b/examples/ruby/devenv.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 {
   languages.ruby.enable = true;
@@ -16,4 +16,12 @@
     # Automatically run bundler upon enterting the shell.
     bundle
   '';
+
+  # Add required dependencies for macOS. These packages are usually provided as
+  # part of the Xcode command line developer tools, in which case they can be
+  # removed.
+  # For more information, see the `--install` flag in `man xcode-select`.
+  packages = lib.optionals pkgs.stdenv.isDarwin [
+    pkgs.libllvm
+  ];
 }
diff --git a/src/modules/services/postgres.nix b/src/modules/services/postgres.nix
@@ -221,7 +221,7 @@ in
     services.postgres.settings = {
       listen_addresses = cfg.listen_addresses;
       port = cfg.port;
-      unix_socket_directories = config.env.PGDATA;
+      unix_socket_directories = lib.mkDefault config.env.PGDATA;
     };
 
     processes.postgres = {