Merge pull request #210738 from figsoda/dog

dogdns: fix build, add figsoda as a maintainer
This commit is contained in:
figsoda
2023-01-17 15:40:32 -05:00
committed by GitHub
2 changed files with 18 additions and 1 deletions
+7 -1
View File
@@ -21,6 +21,12 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-y3T0vXg7631FZ4bzcbQjz3Buui/DFxh9LG8BZWwynp0=";
};
patches = [
# remove date info to make the build reproducible
# remove commit hash to avoid dependency on git and the need to keep `.git`
./remove-date-info.patch
];
nativeBuildInputs = [ installShellFiles just pandoc ]
++ lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
@@ -43,7 +49,7 @@ rustPlatform.buildRustPackage rec {
description = "Command-line DNS client";
homepage = "https://dns.lookup.dog";
license = licenses.eupl12;
maintainers = with maintainers; [ bbigras ];
maintainers = with maintainers; [ bbigras figsoda ];
mainProgram = "dog";
};
}
@@ -0,0 +1,11 @@
--- a/build.rs
+++ b/build.rs
@@ -34,7 +34,7 @@ fn main() -> io::Result<()> {
format!("{}\nv{} \\1;31m(pre-release debug build!)\\0m\n\\1;4;34m{}\\0m", tagline, version_string(), url)
}
else if is_development_version() {
- format!("{}\nv{} [{}] built on {} \\1;31m(pre-release!)\\0m\n\\1;4;34m{}\\0m", tagline, version_string(), git_hash(), build_date(), url)
+ format!("{}\nv{} [nixpkgs] \\1;31m(pre-release!)\\0m\n\\1;4;34m{}\\0m", tagline, version_string(), url)
}
else {
format!("{}\nv{}\n\\1;4;34m{}\\0m", tagline, version_string(), url)