From 52797afa123b420e48570c89ea45bb04d1908734 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 24 Nov 2016 18:18:50 +0100 Subject: Don't override package globally --- ymir.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ymir.nix b/ymir.nix index 28fccc31..d40ac609 100644 --- a/ymir.nix +++ b/ymir.nix @@ -114,15 +114,6 @@ in rec { printf "%s/%s/%s" "''${baseUrl}" "''${prefix}" "''${filename}" ''; - - libinfinity = pkgs.lib.overrideDerivation (pkgs.libinfinity.override { daemon = true; }) (oldAttrs: { - src = pkgs.fetchFromGitHub { - user = "gobby"; - repo = "libinfinity"; - rev = "6c461a34568d40dc1cfcaa6863817e70101873c8"; - sha256 = "1jz9m16aw01z2w1ba9jkq8vr9yyx9yxm63jl6k5vsbp5jdk4xh0l"; - }; - }); }; environment.systemPackages = with pkgs; [ @@ -708,7 +699,14 @@ in rec { services.infinoted = { enable = true; - package = pkgs.libinfinity; + package = pkgs.lib.overrideDerivation (pkgs.libinfinity.override { daemon = true; }) (oldAttrs: { + src = pkgs.fetchFromGitHub { + user = "gobby"; + repo = "libinfinity"; + rev = "6c461a34568d40dc1cfcaa6863817e70101873c8"; + sha256 = "1jz9m16aw01z2w1ba9jkq8vr9yyx9yxm63jl6k5vsbp5jdk4xh0l"; + }; + }); keyFile = "/var/lib/acme/yggdrasil.li/key.pem"; certificateFile = "/var/lib/acme/yggdrasil.li/fullchain.pem"; passwordFile = "/var/lib/infinoted/password"; -- cgit v1.2.3