diff options
| author | Rob <86313040+robert-manchester@users.noreply.github.com> | 2023-10-01 22:21:14 -0700 |
|---|---|---|
| committer | Rob <86313040+robert-manchester@users.noreply.github.com> | 2023-10-01 22:21:14 -0700 |
| commit | d5942e4513b6fb571b7df328ff7b060c56dbb88e (patch) | |
| tree | 7983b486dd2fecdf98f63aa1001e52b64082cfd7 | |
| parent | fef9a2a11b64817ab9fbdf29b8a305e6e11f8304 (diff) | |
fix bad merge
| -rw-r--r-- | pkgs/development/libraries/duckdb/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index b844e0defd2f3..ea152c0cc099d 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , cmake -, git , ninja , openssl , openjdk11 @@ -21,13 +20,17 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = pname; repo = pname; - deepClone = true; rev = "v${version}"; hash = "sha256-EKvDH7RwOC4Gu/lturrfnGpzXnJ9azIwAFeuVoa6L/Y="; }; - nativeBuildInputs = [ cmake git ninja ]; + patches = [ ./version.patch ]; + postPatch = '' + substituteInPlace CMakeLists.txt --subst-var-by DUCKDB_VERSION "v${version}" + ''; + + nativeBuildInputs = [ cmake ninja ]; buildInputs = [ openssl ] ++ lib.optionals withJdbc [ openjdk11 ] ++ lib.optionals withOdbc [ unixODBC ]; @@ -51,7 +54,7 @@ stdenv.mkDerivation rec { installCheckPhase = let - excludes = map (pattern: "exclude:'${pattern}'") ([ + excludes = map (pattern: "exclude:'${pattern}'") [ "[s3]" "Test closing database during long running query" "Test using a remote optimizer pass in case thats important to someone" @@ -92,7 +95,7 @@ stdenv.mkDerivation rec { "test/sql/aggregate/aggregates/test_kurtosis.test" "test/sql/aggregate/aggregates/test_skewness.test" "test/sql/function/list/aggregates/skewness.test" - ]); + ]; in '' runHook preInstallCheck |