diff options
| author | Ivan Babrou <github@ivan.computer> | 2021-02-24 21:13:28 -0800 |
|---|---|---|
| committer | Ivan Babrou <github@ivan.computer> | 2021-02-24 23:41:29 -0800 |
| commit | a422684c87c3f199e13a931ec8f5d7bd061859a7 (patch) | |
| tree | 57b53fbed5910d4cf98597994db20447e0030f60 /pkgs/tools/package-management/cargo-deb/default.nix | |
| parent | 0ae422a4f23d423d1a0b1071f9df146537917706 (diff) | |
| download | nixpkgs-a422684c87c3f199e13a931ec8f5d7bd061859a7.tar nixpkgs-a422684c87c3f199e13a931ec8f5d7bd061859a7.tar.gz nixpkgs-a422684c87c3f199e13a931ec8f5d7bd061859a7.tar.bz2 nixpkgs-a422684c87c3f199e13a931ec8f5d7bd061859a7.tar.lz nixpkgs-a422684c87c3f199e13a931ec8f5d7bd061859a7.tar.xz nixpkgs-a422684c87c3f199e13a931ec8f5d7bd061859a7.tar.zst nixpkgs-a422684c87c3f199e13a931ec8f5d7bd061859a7.zip | |
cargo-deb: do not expect glibc dependency to be added
The test was introduced in v1.25.0: * https://github.com/mmstick/cargo-deb/commit/3597cf28e
Diffstat (limited to 'pkgs/tools/package-management/cargo-deb/default.nix')
| -rw-r--r-- | pkgs/tools/package-management/cargo-deb/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix index 430c29a45f0..f171a150045 100644 --- a/pkgs/tools/package-management/cargo-deb/default.nix +++ b/pkgs/tools/package-management/cargo-deb/default.nix @@ -13,17 +13,21 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "mmstick"; repo = pname; - rev = "86d02f9cacaf4a4f9b576e2dbd9dad65baa61a0d"; + rev = "v${version}"; sha256 = "sha256-oWivGy2azF9zpeZ0UAi7Bxm4iXFWAjcBG0pN7qtkSU8="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-HgGl1JWNkPEBODzWa6mfXuAtF8jOgT0Obx4mX9nOLkk="; + cargoSha256 = "0j9frvcmy9hydw73v0ffr0bjvq2ykylnpmiw700z344djpaaa08y"; preCheck = '' substituteInPlace tests/command.rs \ --replace 'target/debug' "target/${rust.toRustTarget stdenv.buildPlatform}/release" + + # This is an FHS specific assert depending on glibc location + substituteInPlace src/dependencies.rs \ + --replace 'assert!(deps.iter().any(|d| d.starts_with("libc")));' '// no libc assert here' ''; meta = with lib; { |