diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
| commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
| tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/tools/misc/onefetch/zstd-pkg-config.patch | |
| parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
| parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
| download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip | |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/onefetch/zstd-pkg-config.patch')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/onefetch/zstd-pkg-config.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/tools/misc/onefetch/zstd-pkg-config.patch b/nixpkgs/pkgs/tools/misc/onefetch/zstd-pkg-config.patch new file mode 100644 index 000000000000..0ad7542bca64 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/onefetch/zstd-pkg-config.patch @@ -0,0 +1,31 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 202cda0..bc864cc 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -872,6 +872,7 @@ dependencies = [ + "tokei", + "toml", + "yaml-rust", ++ "zstd-sys", + ] + + [[package]] +@@ -1678,4 +1679,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" + dependencies = [ + "cc", + "libc", ++ "pkg-config", + ] +diff --git a/Cargo.toml b/Cargo.toml +index 8e0b5ff..48959b4 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -57,6 +57,8 @@ libc = "0.2.112" + [dev-dependencies] + more-asserts = "0.2" + paste = "1.0.6" ++# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library ++zstd-sys = { version = "1", features = [ "pkg-config" ] } + + [features] + fail-on-deprecated = [] |