Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: nixos/doc/manual/release-notes/rl-2105.xml pkgs/tools/security/sequoia/default.nix
This commit is contained in:
@@ -8,7 +8,6 @@
|
||||
, python3
|
||||
, pkg-config
|
||||
, glib
|
||||
, cmake
|
||||
, libhandy
|
||||
, gtk3
|
||||
, appstream-glib
|
||||
@@ -53,7 +52,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
appstream-glib
|
||||
cmake
|
||||
desktop-file-utils
|
||||
glib
|
||||
gtk3
|
||||
|
||||
Reference in New Issue
Block a user