Subject: nettle-sys: clear out "vendored" feature cruft from build.rs
From: Daniel Kahn Gillmor's avatarDaniel Kahn Gillmor <dkg@fifthhorseman.net>

https://salsa.debian.org/rust-team/debcargo-conf/-/commit/0c71150ad26bb66a8396dcdab055181af232ddc5
https://sources.debian.org/src/rust-nettle-sys/2.0.4-3/debian/patches/disable-vendor.diff/
--- a/Cargo.toml	2019-10-23 13:08:07.000000000 -0400
+++ b/Cargo.toml	2019-10-23 14:08:46.644064014 -0400
@@ -29,12 +29,9 @@
 version = "0.51.1"
 default-features = false
 
-[build-dependencies.nettle-src]
-version = "3.5.1-0"
-optional = true
-
 [build-dependencies.pkg-config]
 version = "0.3"
 
 [features]
 vendored = ["nettle-src"]
+nettle-src = []
diff --git a/build.rs b/build.rs
index 44f7af3..ede4b2f 100644
--- a/build.rs
+++ b/build.rs
@@ -1,7 +1,5 @@
 extern crate bindgen;
 extern crate pkg_config;
-#[cfg(feature = "vendored")]
-extern crate nettle_src;
 
 use std::env;
 use std::fs;
@@ -36,14 +34,6 @@ fn main() {
     println!("cargo:rerun-if-env-changed=NETTLE_STATIC");
     println!("cargo:rerun-if-env-changed={}", NETTLE_PREGENERATED_BINDINGS);
 
-    #[cfg(feature = "vendored")]
-    {
-        let artifacts = nettle_src::Build::new().build();
-        println!("cargo:vendored=1");
-        env::set_var("PKG_CONFIG_PATH",
-                     artifacts.lib_dir().join("pkgconfig"));
-    }
-
     let nettle = pkg_config::probe_library("nettle hogweed").unwrap();
 
     let mode = match env::var_os("NETTLE_STATIC") {
a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/vim.scm'>
<input type='hidden' name='id' value='3a399a241a15335d21616000a2058e8001897f08'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=3a399a241a15335d21616000a2058e8001897f08'>root</a>/<a href='/guix/log/gnu?id=3a399a241a15335d21616000a2058e8001897f08'>gnu</a>/<a href='/guix/log/gnu/packages?id=3a399a241a15335d21616000a2058e8001897f08'>packages</a>/<a href='/guix/log/gnu/packages/vim.scm?id=3a399a241a15335d21616000a2058e8001897f08'>vim.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/vim.scm?id=3a399a241a15335d21616000a2058e8001897f08&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-02-29 14:17:52 -0500'>2020-02-29</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=b5aa17adea398a5d93ecdeb3b1478bfc610d59bf'>gnu: vim: Update to 8.2.0332.</a><span class='msg-avail'>...</span></td><td>Vincent Legoll</td></tr>
<tr><td><span title='2020-02-26 21:52:48 +0100'>2020-02-26</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=cae3b3774ea9905bbf6a7299c3cd964cfa48a705'>gnu: vim-full: Describe differences from vim.</a><span class='msg-avail'>...</span></td><td>Jack Hill</td></tr>
<tr><td><span title='2020-02-25 02:00:05 +0100'>2020-02-25</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=679d41b4406d30ec5805ee8015d2ffa446a4e334'>Revert "gnu: vim: Fix build on CoW file systems."</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-02-23 17:55:05 +0100'>2020-02-23</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=b947ba77e60d3d3c5cc6a1c914096e7dab1f7db7'>gnu: vim: Fix build on CoW file systems.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-02-23 16:42:53 +0200'>2020-02-23</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=40cae204b994300452571f2c9e86d7dc6b83f627'>gnu: vim: Update to 8.2.0303.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2020-02-11 16:14:44 +0200'>2020-02-11</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=d0f31aeeb75371716168b492539623afacd8cf7b'>gnu: vim: Update to 8.2.0236.</a><span class='msg-avail'>...</span></td><td>Jakub Kądziołka</td></tr>
<tr><td><span title='2020-01-28 09:35:07 +0200'>2020-01-28</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=a947ade67d02a3fcb4bfe4f0dcb1d4c575cd6368'>gnu: Add vim-guix-vim.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2020-01-26 14:55:04 +0200'>2020-01-26</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=504b9ba7f953397512e24933c9b46d4fe6e300c0'>gnu: vim-fugitive: Update to 3.2.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2020-01-01 01:08:57 +0100'>2020-01-01</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=442277d01eacd859b21e60e4eac3820d5f868088'>gnu: vim: Update to 8.2.0069.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-12-31 23:07:45 +0100'>2019-12-31</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=9efcc4948143a845355f7869fe05dbcca0f74a34'>gnu: vim: Update to 8.2.0066.</a><span class='msg-avail'>...</span></td><td>Jakub Kądziołka</td></tr>
<tr><td><span title='2019-12-20 10:30:01 +0200'>2019-12-20</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=5d64c1b4185ccf9220b8ecc6efd6d3c567b6ecd7'>gnu: vim-airline: Update to 0.11.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2019-11-28 00:33:47 +0100'>2019-11-28</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=ff3375251d6a316e3ee05589d70a8bb135ec47a6'>gnu: Use the test-only Xorg variant for tests.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-11-13 21:36:00 +0200'>2019-11-13</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=6a9aa795ee23d953ec37140729eacb49a69cd277'>gnu: vim-neocomplete: Don't use unstable tarball.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2019-11-09 00:54:14 +0100'>2019-11-09</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=b6c40df624aeb1bbee40da928ca8edb47f0bb587'>gnu: neovim: Update to 0.4.3.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-10-28 21:22:24 +0100'>2019-10-28</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=42521ab225e031517790dc738ee7a5d8fc846f72'>gnu: vim-syntastic: Update to 3.10.0.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-10-17 21:12:38 +0200'>2019-10-17</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=9fbd0b17691dbe5f9ef76c5def4c1588bccd4a53'>gnu: neovim: Remove unneeded reference.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2019-10-14 20:44:02 +0300'>2019-10-14</span></td><td><a href='/guix/commit/gnu/packages/vim.scm?id=dc505e3eb88faf3c952aa1de4a12a42111c3742c'>gnu: vim-fugitive: Update to 3.1.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>