nixpkgs/pkgs/shells/nushell/use-system-zstd-lib.diff

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

33 lines
771 B
Diff
Raw Normal View History

2021-08-06 21:34:58 +00:00
diff --git a/Cargo.lock b/Cargo.lock
index 4261c06..6d6e537 100644
2021-08-06 21:34:58 +00:00
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2166,6 +2166,7 @@ dependencies = [
2021-08-06 21:34:58 +00:00
"rstest",
"serial_test",
"tempfile",
2021-08-06 21:34:58 +00:00
+ "zstd-sys",
]
2021-08-06 21:34:58 +00:00
[[package]]
@@ -4962,4 +4963,5 @@ checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8"
2021-08-06 21:34:58 +00:00
dependencies = [
"cc",
"libc",
+ "pkg-config",
]
diff --git a/Cargo.toml b/Cargo.toml
index e214da1..b78919a 100644
2021-08-06 21:34:58 +00:00
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,6 +69,9 @@ hamcrest2 = "0.3.0"
rstest = "0.12.0"
itertools = "0.10.3"
2021-08-06 21:34:58 +00:00
+# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library
+zstd-sys = { version = "1", features = [ "pkg-config" ] }
+
[target.'cfg(windows)'.build-dependencies]
embed-resource = "1"