Commit 29589c38 authored by Sergei Trofimovich's avatar Sergei Trofimovich
Browse files

libgda, libgda6: fix the eval 

Without the change the eval fails as:

    $ nix build --no-link -f. libgda
    error:
       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>: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.
parent a1acf36f

pkgs/development/libraries/libgda/6.x.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 \

pkgs/development/libraries/libgda/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;