diff options
| author | aszlig <aszlig@nix.build> | 2019-09-23 06:02:33 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2019-09-23 06:02:33 +0200 |
| commit | ab8fa87b6b4ce9b0684ce5bfc528bbf2e7c59bd0 (patch) | |
| tree | 12c5367a86c926e79278d4acd8181e5e0ded2eaf /machines/aszlig | |
| parent | fdb57a379baa6fe9f508575fc6711a690f9c92ba (diff) | |
machines/brawndo: Use cnijfilter2 from nixpkgs
https://github.com/NixOS/nixpkgs/pull/58399 has been merged a few hours ago, so we no longer need to use our manual override. Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'machines/aszlig')
| -rw-r--r-- | machines/aszlig/managed/brawndo.nix | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/machines/aszlig/managed/brawndo.nix b/machines/aszlig/managed/brawndo.nix index f24f0282..d08b7a3d 100644 --- a/machines/aszlig/managed/brawndo.nix +++ b/machines/aszlig/managed/brawndo.nix @@ -44,19 +44,7 @@ in { services = { deluge.enable = true; - printing.drivers = [ - pkgs.cups-bjnp - # XXX: Until https://github.com/NixOS/nixpkgs/pull/58399 gets merged. - (pkgs.cnijfilter2.overrideAttrs (drv: rec { - name = "cnijfilter2-${version}"; - version = assert drv.version == "5.30"; "5.70"; - src = pkgs.fetchzip { - url = "http://gdlp01.c-wss.com/gds/0/0100009930/01/" - + "cnijfilter2-source-5.70-1.tar.gz"; - sha256 = "045zjsmaidn1m44ki6m1018gjzbj77gm234n5i2lshxpbzpyh0is"; - }; - })) - ]; + printing.drivers = [ pkgs.cups-bjnp pkgs.cnijfilter2 ]; }; swapDevices = lib.singleton { label = "swap"; }; |