summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2018-08-22 22:45:28 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2018-08-22 22:45:28 +0200
commit5ffb63dbc9aad4ad31596b09557c784a4042d25d (patch)
tree74f9e5f0132f21175e69f1a713d4aa5bd3127a73
parenta5a7ec25d8aab91a7d2c51a2d1ac9efc368cfa22 (diff)
downloadnixos-5ffb63dbc9aad4ad31596b09557c784a4042d25d.tar
nixos-5ffb63dbc9aad4ad31596b09557c784a4042d25d.tar.gz
nixos-5ffb63dbc9aad4ad31596b09557c784a4042d25d.tar.bz2
nixos-5ffb63dbc9aad4ad31596b09557c784a4042d25d.tar.xz
nixos-5ffb63dbc9aad4ad31596b09557c784a4042d25d.zip
...
-rw-r--r--hel.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/hel.nix b/hel.nix
index cbd7165e..f367d255 100644
--- a/hel.nix
+++ b/hel.nix
@@ -126,6 +126,10 @@
126 126
127 configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; 127 configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ];
128 }; 128 };
129
130 fprintd = pkgs.stdenv.lib.overrideDerivation pkgs.fprintd (oldAttrs: {
131 buildFlags = oldAttrs.buildFlags or [] ++ [ "sysconfdir=$(out)/etc" ];
132 });
129 }; 133 };
130 134
131 nixpkgs.config.allowUnfree = true; 135 nixpkgs.config.allowUnfree = true;
@@ -444,8 +448,6 @@
444 MPD_PORT = "6600"; 448 MPD_PORT = "6600";
445 }; 449 };
446 450
447 environment.etc."fprintd.conf".source = "${pkgs.fprintd}/etc/fprintd.conf";
448
449 environment.etc."X11/xorg.conf.d/50-wacom.conf".source = lib.mkForce ./hel/wacom.conf; 451 environment.etc."X11/xorg.conf.d/50-wacom.conf".source = lib.mkForce ./hel/wacom.conf;
450 452
451 environment.etc."sane.d/dll.conf".text = "xerox_mfp"; 453 environment.etc."sane.d/dll.conf".text = "xerox_mfp";