summaryrefslogtreecommitdiffstats
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/gdk-pixbuf/default.nix3
-rw-r--r--pkgs/development/libraries/geoclue/default.nix2
-rw-r--r--pkgs/development/libraries/glib/default.nix2
-rw-r--r--pkgs/development/libraries/libcec/default.nix4
-rw-r--r--pkgs/development/libraries/libsoup/default.nix4
-rw-r--r--pkgs/development/libraries/mesa/default.nix4
-rw-r--r--pkgs/development/libraries/v8/default.nix2
7 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 08b8f70b2d9a..1f4bc5c12ada 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -21,6 +21,7 @@
, doCheck ? false
, makeWrapper
, fetchpatch
+, lib
}:
stdenv.mkDerivation rec {
@@ -74,7 +75,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Ddocs=true"
"-Dx11=false" # use gdk-pixbuf-xlib
- "-Dgir=${if gobject-introspection != null then "true" else "false"}"
+ "-Dgir=${lib.boolToString (gobject-introspection != null)}"
"-Dgio_sniffing=false"
];
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index da76c6dfedcf..74d778c5c555 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"
- "-Ddemo-agent=${if withDemoAgent then "true" else "false"}"
+ "-Ddemo-agent=${boolToString withDemoAgent}"
"--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc"
"-Ddbus-srv-user=geoclue"
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 88848deec412..df19b9fc88cc 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
# Avoid the need for gobject introspection binaries in PATH in cross-compiling case.
# Instead we just copy them over from the native output.
- "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}"
+ "-Dgtk_doc=${boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}"
"-Dnls=enabled"
"-Ddevbindir=${placeholder ''dev''}/bin"
];
diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index a1c2967dde73..792d899333e0 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform, libraspberrypi ? null }:
-let version = "4.0.5"; in
+let version = "4.0.7"; in
stdenv.mkDerivation {
pname = "libcec";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
- sha256 = "0hvp33mq0kg544hw20aq3vy5lxf5zid6gxm3qdga7wxw1r1lkmz4";
+ sha256 = "0nii8qh3qrn92g8x3canj4glb2bjn6gc1p3f6hfp59ckd4vjrndw";
};
nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index a497661725b1..9f4a5bac25bf 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3
, gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala
-, libpsl, python3, brotli }:
+, libpsl, python3, brotli, lib }:
stdenv.mkDerivation rec {
pname = "libsoup";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
"-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency
"-Dgssapi=disabled"
"-Dvapi=enabled"
- "-Dgnome=${if gnomeSupport then "true" else "false"}"
+ "-Dgnome=${lib.boolToString gnomeSupport}"
"-Dntlm=disabled"
];
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 9fda8091ce47..aeeb0514fabb 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -129,7 +129,7 @@ stdenv.mkDerivation {
"-Domx-libs-path=${placeholder "drivers"}/lib/bellagio"
"-Dva-libs-path=${placeholder "drivers"}/lib/dri"
"-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d"
- "-Dgallium-nine=${if enableGalliumNine then "true" else "false"}" # Direct3D in Wine
+ "-Dgallium-nine=${boolToString enableGalliumNine}" # Direct3D in Wine
"-Dosmesa=${if enableOSMesa then "gallium" else "none"}" # used by wine
] ++ optionals stdenv.isLinux [
"-Dglvnd=true"
@@ -229,7 +229,7 @@ stdenv.mkDerivation {
inherit (libglvnd) driverLink;
};
- meta = with stdenv.lib; {
+ meta = {
description = "An open source 3D graphics library";
longDescription = ''
The Mesa project began as an open-source implementation of the OpenGL
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 60e856e61dfe..e6696626cb5d 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
gnFlags = [
"use_custom_libcxx=false"
- "is_clang=${if stdenv.cc.isClang then "true" else "false"}"
+ "is_clang=${lib.boolToString stdenv.cc.isClang}"
"use_sysroot=false"
# "use_system_icu=true"
"is_component_build=false"