pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
|
||||
{ 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
|
||||
@@ -12,7 +12,7 @@ assert postgresSupport -> postgresql != null;
|
||||
version = "5.2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g";
|
||||
};
|
||||
|
||||
@@ -24,7 +24,7 @@ assert postgresSupport -> postgresql != null;
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = with stdenv.lib; [
|
||||
configureFlags = with lib; [
|
||||
"--with-mysql=${if mysqlSupport then "yes" else "no"}"
|
||||
"--with-postgres=${if postgresSupport then "yes" else "no"}"
|
||||
|
||||
@@ -41,7 +41,7 @@ assert postgresSupport -> postgresql != null;
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala autoreconfHook gtk-doc autoconf-archive yelp-tools ];
|
||||
buildInputs = with stdenv.lib; [ gtk3 openssl libgee ]
|
||||
buildInputs = with lib; [ gtk3 openssl libgee ]
|
||||
++ optional (mysqlSupport) libmysqlclient
|
||||
++ optional (postgresSupport) postgresql;
|
||||
|
||||
@@ -51,7 +51,7 @@ assert postgresSupport -> postgresql != null;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Database access library";
|
||||
homepage = "https://www.gnome-db.org/";
|
||||
license = [ licenses.lgpl2 licenses.gpl2 ];
|
||||
|
||||
Reference in New Issue
Block a user