public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #58214 from worldofpeace/gtk3-take2

Browse Source 
treewide: no gnome aliases
This commit is contained in:
worldofpeace
2019-03-24 15:42:31 -04:00
committed by GitHub
parent cf7f234ff5 97eb65324d
commit fc47b4023c
14 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/aravis/default.nix
+3 -1
View File
@@ -7,6 +7,7 @@
, gst-plugins-bad ? null
, libnotify ? null
, gnome3 ? null
, gtk3 ? null
, enableUsb ? true
, enablePacketSocket ? true
, enableViewer ? true
@@ -26,6 +27,7 @@ in
assert enableViewer -> enableGstPlugin;
assert enableViewer -> libnotify != null;
assert enableViewer -> gnome3 != null;
assert enableViewer -> gtk3 != null;
assert enableViewer -> gstreamerAtLeastVersion1;
stdenv.mkDerivation rec {
@@ -54,7 +56,7 @@ in
++ stdenv.lib.optional enableUsb libusb
++ stdenv.lib.optional enablePacketSocket audit
++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.adwaita-icon-theme ];
++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ];
preAutoreconf = ''./autogen.sh'';