diff options
| author | aszlig <aszlig@nix.build> | 2019-09-06 01:41:03 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2019-09-06 01:41:03 +0200 |
| commit | c4d27fd952185e9cf5cd5afa5997bb4d1a3ce489 (patch) | |
| tree | 2b524b965097da4af3e729886133c53a2f3cab7c /machines/aszlig | |
| parent | 5b3f0811af21acb825ca5b11b4e7f57437aa6cba (diff) | |
machines/dnyarri: Fix allowUnfreePredicate
Since NixOS/nixpkgs@c814d72b517bb201c8bbbfc64e386c7023352886, a lot of packages now no longer have a name attribute but instead use pname, so when checking the package name within allowUnfreePredicate we need to make sure that we fall back to a default if the name attribute is not present. This fixes evaluation of the machine, however I didn't check if it actually builds. Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'machines/aszlig')
| -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 7e42f607..482395ee 100644 --- a/machines/aszlig/dnyarri.nix +++ b/machines/aszlig/dnyarri.nix @@ -63,7 +63,7 @@ in { # This is very ugly and I really want to avoid non-free packages on all # of my workstations. But right now I need to get rid of useless paper. nixpkgs.config.allowUnfreePredicate = pkg: let - inherit (builtins.parseDrvName pkg.name) name; + inherit (builtins.parseDrvName (pkg.name or "")) name; in name == "hplip"; nixpkgs.overlays = lib.singleton (lib.const (super: { hplip = super.hplip.override { withPlugin = true; }; |