From 29589c387651a9b19a578234060e8b4ece3db9d8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 13 Sep 2024 21:34:56 +0100 Subject: [PATCH] libgda, libgda6: fix the eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change the eval fails as: $ nix build --no-link -f. libgda error: … while calling the 'derivationStrict' builtin at :34:12: 33| 34| strict = derivationStrict drvAttrs; | ^ 35| … while evaluating derivation 'libgda-5.2.10' whose name attribute is located at kgs/stdenv/generic/make-derivation.nix:336:7 … while evaluating attribute 'NIX_CFLAGS_COMPILE' of derivation 'libgda-5.2.10' (stack trace truncated; use '--show-trace' to show the full, detailed trace) error: The `env` attribute set can only contain derivation, string, boolean or integer attributes. The `NIX_CFLAGS_COMPILE` attribute is of type list. --- pkgs/development/libraries/libgda/6.x.nix | 2 +- pkgs/development/libraries/libgda/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index af05b23080eb..72f4741fd2e7 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { postgresql ]; - env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; postPatch = '' patchShebangs \ diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index aa136ed0adbd..a8af4d9b4874 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { "--enable-system-sqlite=${if stdenv.isDarwin then "no" else "yes"}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; enableParallelBuilding = true;