aemu,gfxstream: use release tags
These was previously using different commits, because upstream had told me that they would be the 0.1.2 releases, and then ended up changing their mind when they finally got around to tagging them.
This commit is contained in:
@@ -5,14 +5,14 @@
|
||||
cmake,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aemu";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitiles {
|
||||
url = "https://android.googlesource.com/platform/hardware/google/aemu";
|
||||
rev = "07ccc3ded3357e67e39104f18f35feaf8b3b6a0e";
|
||||
hash = "sha256-H3IU9aTFSzUAqYgrtHd4F18hbhZsbOJGC4K5JwMQOOw=";
|
||||
rev = "v${finalAttrs.version}-aemu-release";
|
||||
hash = "sha256-8UMm2dXdvmX6rUn4wQWuqI8bamwgf0x/5BQT+7atzjY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -48,4 +48,4 @@ stdenv.mkDerivation {
|
||||
"aarch64-darwin"
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -15,25 +15,16 @@
|
||||
xorg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gfxstream";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitiles {
|
||||
url = "https://android.googlesource.com/platform/hardware/google/gfxstream";
|
||||
rev = "a29282666c0e2fdbb2c98cfe68a7c0677163ef91";
|
||||
hash = "sha256-IYXkaHZPEYIE9KW731GN6x6yRS+FYtP1zyHcaSofhIM=";
|
||||
rev = "v${finalAttrs.version}-gfxstream-release";
|
||||
hash = "sha256-AN6OpZQ2te4iVuh/kFHXzmLAWIMyuoj9FHTVicnbiPw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Make libdrm an optional dependency, which is required to build on Darwin.
|
||||
(fetchpatch {
|
||||
url = "https://android.googlesource.com/platform/hardware/google/gfxstream/+/a8df2a3eb099b419a7b3638e68ea30b4cffb751b%5E%21/?format=TEXT";
|
||||
decode = "base64 -d";
|
||||
hash = "sha256-shjeNuxtQokscCGBKEUbOPKOWRELBAnHFNj3Y5w87Nw=";
|
||||
})
|
||||
];
|
||||
|
||||
# Ensure that meson can find an Objective-C compiler on Darwin.
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace meson.build \
|
||||
@@ -77,4 +68,4 @@ stdenv.mkDerivation {
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
platforms = aemu.meta.platforms;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user