about summary refs log tree commit diff
path: root/nixos/modules/services/development
diff options
context:
space:
mode:
authorV <v@anomalous.eu>2024-02-26 02:49:57 +0100
committerV <v@anomalous.eu>2024-02-29 23:10:31 +0100
commitff990ea66a031d719eb8b9bae7c52a04b1628138 (patch)
tree7713a989d5eed2b81e4ca271d67c3694cb94fa23 /nixos/modules/services/development
parenta51f0948785e5a431f8f1267b890228abc2382c7 (diff)
downloadnixlib-ff990ea66a031d719eb8b9bae7c52a04b1628138.tar
nixlib-ff990ea66a031d719eb8b9bae7c52a04b1628138.tar.gz
nixlib-ff990ea66a031d719eb8b9bae7c52a04b1628138.tar.bz2
nixlib-ff990ea66a031d719eb8b9bae7c52a04b1628138.tar.lz
nixlib-ff990ea66a031d719eb8b9bae7c52a04b1628138.tar.xz
nixlib-ff990ea66a031d719eb8b9bae7c52a04b1628138.tar.zst
nixlib-ff990ea66a031d719eb8b9bae7c52a04b1628138.zip
nixos/nixseparatedebuginfod: fix compatibility with Nix 2.3
Appending to options with the `extra-` prefix was added in Nix 2.4,
which makes config validation fail on this version without the guard.

Change-Id: Ie253978dbaf00b228fecc08698a3dcc01cd2d82b
Diffstat (limited to 'nixos/modules/services/development')
-rw-r--r--nixos/modules/services/development/nixseparatedebuginfod.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/development/nixseparatedebuginfod.nix b/nixos/modules/services/development/nixseparatedebuginfod.nix
index daf85153d339..a2ec0d2c80e1 100644
--- a/nixos/modules/services/development/nixseparatedebuginfod.nix
+++ b/nixos/modules/services/development/nixseparatedebuginfod.nix
@@ -90,7 +90,9 @@ in
 
     users.groups.nixseparatedebuginfod = { };
 
-    nix.settings.extra-allowed-users = [ "nixseparatedebuginfod" ];
+    nix.settings = lib.optionalAttrs (lib.versionAtLeast config.nix.package.version "2.4") {
+      extra-allowed-users = [ "nixseparatedebuginfod" ];
+    };
 
     environment.variables.DEBUGINFOD_URLS = "http://${url}";