Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 18 additions & 28 deletions pkgs/by-name/am/amp/package.nix
Original file line number Diff line number Diff line change
@@ -1,48 +1,38 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
openssl,
pkg-config,
python3,
xorg,
cmake,
libgit2,
curl,
pkgsBuildBuild,
stdenv,
zlib,
writableTmpDirAsHomeHook,
}:

rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "amp";
version = "0.7.0";
version = "0.7.1";

src = fetchFromGitHub {
owner = "jmacdonald";
repo = "amp";
tag = version;
hash = "sha256-xNadwz2agPbxvgUqrUf1+KsWTmeNh8hJIWcNwTzzM/M=";
tag = finalAttrs.version;
hash = "sha256-YK+HSWTtSVLK8n7NDiif3bBqp/dQW2UTYo3yYcZ5cIA=";
};

cargoPatches = [ ./update_time_crate.patch ];

useFetchCargoVendor = true;
cargoHash = "sha256-4lYywaPTfoOHEYHy+h7HfWn+OaDdk166tQ8ZFx9XZK0=";
cargoHash = "sha256-6enFOmIAYOgOdoeA+pk37+BobI5AGPBxjp73Gd4C+gI=";

nativeBuildInputs = [
cmake
pkg-config
python3
# git rev-parse --short HEAD
(pkgsBuildBuild.writeShellScriptBin "git" "echo 0000000")
];
buildInputs =
[
openssl
xorg.libxcb
libgit2
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
curl
];

buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
zlib
];

# Needing libgit2 <=1.8.0
#env.LIBGIT2_NO_VENDOR = 1;

nativeCheckInputs = [
writableTmpDirAsHomeHook
Expand All @@ -58,4 +48,4 @@ rustPlatform.buildRustPackage rec {
];
mainProgram = "amp";
};
}
})
56 changes: 0 additions & 56 deletions pkgs/by-name/am/amp/update_time_crate.patch

This file was deleted.