nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

avahi: remove config.avahi

Browse Source 
This was added in 6832a42b7f, which
replaced an attrset with `qt4Support = config.avahi.qt4Support or false;`.

As qt4 support is now out of the tree, so should this be as well.
This commit is contained in:
Philip Taron 2024-09-03 13:04:14 -07:00
parent a5317c3338
commit 26a7a87293
No known key found for this signature in database
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/avahi/default.nix
View File

@ -1,6 +1,7 @@
{ fetchurl
, fetchpatch
, lib
, config
, stdenv
, pkg-config
, libdaemon
@ -21,6 +22,9 @@
, withPython ? false
}:
# Added 2024-09-03. Drop this assertion after 24.11 is released.
assert lib.assertMsg (config.avahi or {} == {}) "config.avahi has been removed; please use an overlay or services.avahi.package to configure the avahi package.";
stdenv.mkDerivation rec {
pname = "avahi${lib.optionalString withLibdnssdCompat "-compat"}";
version = "0.8";

6
pkgs/top-level/all-packages.nix
View File

@ -4029,11 +4029,11 @@ with pkgs;
autorandr = callPackage ../tools/misc/autorandr { };
avahi = callPackage ../development/libraries/avahi (config.avahi or {});
avahi = callPackage ../development/libraries/avahi { };
avahi-compat = callPackage ../development/libraries/avahi ((config.avahi or {}) // {
avahi-compat = callPackage ../development/libraries/avahi {
withLibdnssdCompat = true;
});
};
avro-c = callPackage ../development/libraries/avro-c { };