diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index f8d890d22297..e90ec51768f9 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -5,6 +5,7 @@ fetchDebianPatch, libedit, autoreconfHook, + cmake, zlib, unzip, libtommath, @@ -48,6 +49,9 @@ let enableParallelBuilding = true; + __structuredAttrs = true; + strictDeps = true; + installPhase = '' runHook preInstall mkdir -p $out @@ -113,5 +117,32 @@ rec { } ); - firebird = firebird_4; + firebird_5 = stdenv.mkDerivation ( + base + // rec { + version = "5.0.4"; + + src = fetchFromGitHub { + owner = "FirebirdSQL"; + repo = "firebird"; + rev = "v${version}"; + hash = "sha256-wAiOyCVS7fjVqrDlJJwDFxw5ZD5spnXlYKCAQ8gctHI="; + }; + + # CMake is just used for libcds + dontUseCmakeConfigure = true; + + nativeBuildInputs = base.nativeBuildInputs ++ [ + cmake + unzip + ]; + buildInputs = base.buildInputs ++ [ + zlib + libtommath + libtomcrypt + ]; + } + ); + + firebird = firebird_5; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e6cc40f54d9..48ca4b76b64b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8009,6 +8009,7 @@ with pkgs; dovecot_pigeonhole_2_4 = dovecot_pigeonhole; inherit (callPackages ../servers/firebird { }) + firebird_5 firebird_4 firebird_3 firebird