Commit 30908712 authored by sternenseemann's avatar sternenseemann
Browse files

gnatcoll-{sql*,postgres,xref,db2ada}, gnatinspect: 22.0.0 -> 23.0.0

parent a1647c38
Loading
Loading
Loading
Loading
+2 −9
Original line number Diff line number Diff line
@@ -51,22 +51,15 @@ in

stdenv.mkDerivation rec {
  pname = "gnatcoll-${component}";
  version = "22.0.0";
  version = "23.0.0";

  src = fetchFromGitHub {
    owner = "AdaCore";
    repo = "gnatcoll-db";
    rev = "v${version}";
    sha256 = "1c39yg13faadg5mzpq3s83rn24npmpc4yjj0cvj7kqwpqxci4m55";
    sha256 = "1j77ina17myahlsvbyiycgxkncd7ijc7jrvzwa4gagx0fwjk7prh";
  };

  patches = lib.optionals (component == "sqlite") [
    # fixes build of the static sqlite component
    # when building against the system libsqlite3
    # See https://github.com/AdaCore/gprbuild/issues/27#issuecomment-298444608
    ./gnatcoll-db-sqlite-static-external.patch
  ];

  # Link executables dynamically unless specified by the platform,
  # as we usually do in nixpkgs where possible
  postPatch = lib.optionalString (!stdenv.hostPlatform.isStatic) ''
+0 −18
Original line number Diff line number Diff line
diff --git a/sqlite/gnatcoll_sqlite.gpr b/sqlite/gnatcoll_sqlite.gpr
index 5bd53d35..580739f8 100644
--- a/sqlite/gnatcoll_sqlite.gpr
+++ b/sqlite/gnatcoll_sqlite.gpr
@@ -69,7 +69,12 @@ project GnatColl_Sqlite is
          for Source_Dirs use (".", "amalgamation");
       when "external" =>
          for Source_Dirs use (".");
-         for Library_Options use ("-lsqlite3") & Thread_Lib;
+         case Library_Type is
+            when "relocatable" =>
+               for Library_Options use ("-lsqlite3") & Thread_Lib;
+            when others =>
+               null;
+         end case;
    end case;
 
    package Compiler is