diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-02-01 18:59:24 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-02-01 20:14:50 +0100 |
commit | e7b5ea29a036367afedcc007a20c477adfb3ff6c (patch) | |
tree | b3fc80c9ec3356c5ce7dd0299a6d30971421c88a | |
parent | 21b5924f246bce763cf57a606bd601876eecda11 (diff) | |
download | nixpkgs-e7b5ea29a036367afedcc007a20c477adfb3ff6c.tar nixpkgs-e7b5ea29a036367afedcc007a20c477adfb3ff6c.tar.gz nixpkgs-e7b5ea29a036367afedcc007a20c477adfb3ff6c.tar.bz2 nixpkgs-e7b5ea29a036367afedcc007a20c477adfb3ff6c.tar.lz nixpkgs-e7b5ea29a036367afedcc007a20c477adfb3ff6c.tar.xz nixpkgs-e7b5ea29a036367afedcc007a20c477adfb3ff6c.tar.zst nixpkgs-e7b5ea29a036367afedcc007a20c477adfb3ff6c.zip |
libgda: clean up the expression
This will make the diff against libgda6 smaller.
-rw-r--r-- | pkgs/development/libraries/libgda/default.nix | 67 |
1 files changed, 55 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 73e71de4aac..307cc14a6ef 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,7 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee -, overrideCC, gcc6, fetchpatch, autoreconfHook, gtk-doc, autoconf-archive, yelp-tools -, mysqlSupport ? false, libmysqlclient ? null -, postgresSupport ? false, postgresql ? null +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, itstool +, libxml2 +, gtk3 +, openssl +, gnome3 +, gobject-introspection +, vala +, libgee +, overrideCC +, gcc6 +, fetchpatch +, autoreconfHook +, gtk-doc +, autoconf-archive +, yelp-tools +, mysqlSupport ? false +, libmysqlclient ? null +, postgresSupport ? false +, postgresql ? null }: assert mysqlSupport -> libmysqlclient != null; @@ -24,7 +44,30 @@ assert postgresSupport -> postgresql != null; }) ]; - configureFlags = with lib; [ + nativeBuildInputs = [ + pkg-config + intltool + itstool + libxml2 + gobject-introspection + vala + autoreconfHook + gtk-doc + autoconf-archive + yelp-tools + ]; + + buildInputs = [ + gtk3 + openssl + libgee + ] ++ lib.optionals mysqlSupport [ + libmysqlclient + ] ++ lib.optionals postgresSupport [ + postgresql + ]; + + configureFlags = [ "--with-mysql=${if mysqlSupport then "yes" else "no"}" "--with-postgres=${if postgresSupport then "yes" else "no"}" @@ -40,11 +83,6 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala autoreconfHook gtk-doc autoconf-archive yelp-tools ]; - buildInputs = with lib; [ gtk3 openssl libgee ] - ++ optional (mysqlSupport) libmysqlclient - ++ optional (postgresSupport) postgresql; - passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -54,8 +92,13 @@ assert postgresSupport -> postgresql != null; meta = with lib; { description = "Database access library"; homepage = "https://www.gnome-db.org/"; - license = [ licenses.lgpl2 licenses.gpl2 ]; + license = with licenses; [ + # library + lgpl2Plus + # CLI tools + gpl2Plus + ]; maintainers = teams.gnome.members; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } |