From 5437424297c067a706081a26146bc1c65590c39a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Dec 2012 15:02:58 +0100 Subject: [PATCH] Hackery to build against both the nixpkgs master and systemd branch --- modules/misc/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix index 021986bc895..03979e259bf 100644 --- a/modules/misc/nixpkgs.nix +++ b/modules/misc/nixpkgs.nix @@ -76,7 +76,7 @@ in # FIXME nixpkgs.config.packageOverrides = pkgs: { #udev = pkgs.systemd; - slim = pkgs.slim.override { consolekit = null; }; + slim = pkgs.slim.override (args: if args ? consolekit then { consolekit = null; } else { }); lvm2 = pkgs.lvm2.override { udev = pkgs.systemd; }; upower = pkgs.upower.override { useSystemd = true; }; polkit = pkgs.polkit.override { useSystemd = true; };