diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2017-04-19 07:15:06 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2017-04-19 07:15:06 +0200 |
| commit | 180ba349bc9caa660ae411f2d8a58c91192af1e0 (patch) | |
| tree | e7f243e7b2485f6d8254183ee7517da3459205ee /machines/aszlig/dnyarri.nix | |
| parent | a2152f28006cb92b349f404112a50caca5d89ccf (diff) | |
dnyarri: Fix allowUnfreePredicate match of hplip
The derivation name now is just "hplip-VERSION" (eg. "hplip-3.16.11") instead of "pythonX.Y-hplip-VERSION". The upstream commit changing this was: NixOS/nixpkgs@3760c8c7fde6e8b15d19b063579d05018fc2d8b3 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines/aszlig/dnyarri.nix')
| -rw-r--r-- | machines/aszlig/dnyarri.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix index 97be2d72..0141fe36 100644 --- a/machines/aszlig/dnyarri.nix +++ b/machines/aszlig/dnyarri.nix @@ -59,7 +59,7 @@ in { nixpkgs.config = { allowUnfreePredicate = pkg: let inherit (builtins.parseDrvName pkg.name) name; - in lib.hasSuffix "-hplip" name && lib.hasPrefix "python" name; + in name == "hplip"; packageOverrides = super: { hplip = super.hplip.override { withPlugin = true; }; }; |