From ae67327df3faaf106d2bcb352d4151774576bf00 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Fri, 29 Dec 2023 22:40:38 +0100
Subject: ...

---
 hosts/surtr/postgresql/default.nix  | 8 +++++++-
 hosts/vidhar/pgbackrest/default.nix | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'hosts')

diff --git a/hosts/surtr/postgresql/default.nix b/hosts/surtr/postgresql/default.nix
index faf74588..f0e42ee8 100644
--- a/hosts/surtr/postgresql/default.nix
+++ b/hosts/surtr/postgresql/default.nix
@@ -1,6 +1,11 @@
 { pkgs, sources, config, flake, flakeInputs, ... }:
 let
   versioning = sources.psql-versioning.src;
+
+  nixpkgs-pgbackrest = import (flakeInputs.nixpkgs-pgbackrest.outPath + "/pkgs/top-level") {
+    overlays = [ flake.overlays.libdscp ];
+    localSystem = config.nixpkgs.system;
+  };
 in {
   config = {
     assertions = [
@@ -16,7 +21,8 @@ in {
 
     services.pgbackrest = {
       enable = true;
-      package = flakeInputs.nixpkgs-pgbackrest.legacyPackages.${config.nixpkgs.system}.pgbackrest;
+      package = nixpkgs-pgbackrest.pgbackrest;
+      dscpPackage = nixpkgs-pgbackrest.libdscp;
 
       settings = {
         "surtr" = {
diff --git a/hosts/vidhar/pgbackrest/default.nix b/hosts/vidhar/pgbackrest/default.nix
index fec0c1fb..ffb149f5 100644
--- a/hosts/vidhar/pgbackrest/default.nix
+++ b/hosts/vidhar/pgbackrest/default.nix
@@ -2,6 +2,11 @@
 
 let
   surtrRepoCfg = flake.nixosConfigurations."surtr".config.services.pgbackrest.settings.surtr;
+
+  nixpkgs-pgbackrest = import (flakeInputs.nixpkgs-pgbackrest.outPath + "/pkgs/top-level") {
+    overlays = [ flake.overlays.libdscp ];
+    localSystem = config.nixpkgs.system;
+  };
 in {
   config = {
     assertions = [
@@ -12,7 +17,8 @@ in {
 
     services.pgbackrest = {
       enable = true;
-      package = flakeInputs.nixpkgs-pgbackrest.legacyPackages.${config.nixpkgs.system}.pgbackrest;
+      package = nixpkgs-pgbackrest.pgbackrest;
+      dscpPackage = nixpkgs-pgbackrest.libdscp;
 
       tlsServer = {
         enable = true;
-- 
cgit v1.2.3