diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-11-27 22:26:55 +0100 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-11-27 22:26:55 +0100 |
commit | fe9411fe9ba084fab80d9459afcf5c09203832ae (patch) | |
tree | 120de9f3710a92f4cc40979f8751c37a23d7b5a8 | |
parent | ceee02670c41f466c3a76816b256e8483b0cc3dd (diff) |
libappindicator: remove unnecessary ? null from inputs, remove global with lib
-rw-r--r-- | pkgs/development/libraries/libappindicator/default.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 8ca2acc11c715..9df992a5763d0 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -2,17 +2,15 @@ { stdenv, fetchgit, lib , pkg-config, autoreconfHook -, glib, dbus-glib, gtkVersion ? "3" -, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null -, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null +, glib, dbus-glib +, gtkVersion ? "3" +, gtk2, libindicator-gtk2, libdbusmenu-gtk2 +, gtk3, libindicator-gtk3, libdbusmenu-gtk3 , gtk-doc, vala, gobject-introspection -, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null +, monoSupport ? false, mono, gtk-sharp-2_0 }: -with lib; - - -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; in "libappindicator-${postfix}"; version = "12.10.1+20.10.20200706.1"; @@ -35,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus-glib ] ++ (if gtkVersion == "2" - then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] + then [ libindicator-gtk2 ] ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ] else [ libindicator-gtk3 ]); preAutoreconf = '' @@ -56,7 +54,7 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - meta = { + meta = with lib; { description = "A library to allow applications to export a menu into the Unity Menu bar"; homepage = "https://launchpad.net/libappindicator"; license = with licenses; [ lgpl21 lgpl3 ]; |