diff options
Diffstat (limited to 'pkgs/development/libraries/libdbusmenu/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libdbusmenu/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 0b5531d70c543..7b0fca8583998 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -2,9 +2,8 @@ , pkg-config, intltool , glib, dbus-glib, json-glib , gobject-introspection, vala -, gtkVersion ? null, gtk2 ? null, gtk3 ? null }: - -with lib; +, gtkVersion ? null, gtk2, gtk3 +}: stdenv.mkDerivation rec { pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}"; @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus-glib json-glib - ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); + ] ++ lib.optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); postPatch = '' for f in {configure,ltmain.sh,m4/libtool.m4}; do @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" (if gtkVersion == null then "--disable-gtk" else "--with-gtk=${gtkVersion}") "--disable-scrollkeeper" - ] ++ optional (gtkVersion != "2") "--disable-dumper"; + ] ++ lib.optional (gtkVersion != "2") "--disable-dumper"; doCheck = false; # generates shebangs in check phase, too lazy to fix @@ -50,7 +49,7 @@ stdenv.mkDerivation rec { "typelibdir=${placeholder "out"}/lib/girepository-1.0" ]; - meta = { + meta = with lib; { description = "Library for passing menu structures across DBus"; homepage = "https://launchpad.net/dbusmenu"; license = with licenses; [ gpl3 lgpl21 lgpl3 ]; |