X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=overlays%2Fnixops%2Fdefault.nix;h=a2976850fa713518ef25f194b55dfebd61bb9b23;hb=6c95e93c85640e1fe544ed1b6a0b83e27725d0f0;hp=5b4bc8692066e31020f44b8d51363a15213dcf6f;hpb=b76b1d1f1678e329d0596e4403620f653a763d96;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/overlays/nixops/default.nix b/overlays/nixops/default.nix
index 5b4bc86..a297685 100644
--- a/overlays/nixops/default.nix
+++ b/overlays/nixops/default.nix
@@ -1,6 +1,7 @@
 self: super: {
   nixops = super.nixops.overrideAttrs (old: {
     patches = [
+        ./fix_glibc.patch
         (self.fetchpatch {
           name = "hetzner_cloud.patch";
           url = "https://github.com/goodraven/nixops/commit/272e50d0b0262e49cdcaad42cdab57aad183d1c2.patch";
@@ -8,6 +9,10 @@ self: super: {
         })
        ];
     preConfigure = (old.preConfigure or "") + ''
+      # https://github.com/NixOS/nixops/issues/1216
+      sed -i -e "/Register the paths in the Nix database./s/#.*$/export USER=root/" nix/libvirtd-image.nix
+
+      sed -i -e '/^import sys$/s/$/; sys.tracebacklimit = 0/' scripts/nixops
       sed -i -e "/'keyFile'/s/'path'/'string'/" nixops/backends/__init__.py
       '';
   });