diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/development/libraries/aravis | |
parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/aravis')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/aravis/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/aravis/default.nix b/nixpkgs/pkgs/development/libraries/aravis/default.nix index a915723e2ca7..67e621ad8597 100644 --- a/nixpkgs/pkgs/development/libraries/aravis/default.nix +++ b/nixpkgs/pkgs/development/libraries/aravis/default.nix @@ -6,7 +6,7 @@ , gst-plugins-good ? null , gst-plugins-bad ? null , libnotify ? null -, gnome3 ? null +, gnome ? null , gtk3 ? null , enableUsb ? true , enablePacketSocket ? true @@ -26,7 +26,7 @@ in assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; assert enableViewer -> enableGstPlugin; assert enableViewer -> libnotify != null; - assert enableViewer -> gnome3 != null; + assert enableViewer -> gnome != null; assert enableViewer -> gtk3 != null; assert enableViewer -> gstreamerAtLeastVersion1; @@ -56,7 +56,7 @@ in ++ lib.optional enableUsb libusb1 ++ lib.optional enablePacketSocket audit ++ lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] - ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ]; + ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome.adwaita-icon-theme ]; preAutoreconf = "./autogen.sh"; |