Merge pull request #164688 from peterhoeg/f/airshipper
airshipper: work around deprecated names
This commit is contained in:
commit
b8522e27a1
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
|
, fetchpatch
|
||||||
, openssl
|
, openssl
|
||||||
, vulkan-loader
|
, vulkan-loader
|
||||||
, wayland
|
, wayland
|
||||||
|
@ -25,6 +26,14 @@ rustPlatform.buildRustPackage rec {
|
||||||
sha256 = "sha256-nOE9ZNHxLEAnMkuBSpxmeq3DxkRIlcoase6AxU+eFug=";
|
sha256 = "sha256-nOE9ZNHxLEAnMkuBSpxmeq3DxkRIlcoase6AxU+eFug=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# this *should* be merged in time for the release following 0.7.0
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/veloren/Airshipper/commit/97fc986ab4cbf59f2c764f647710f19db86031b4.patch";
|
||||||
|
hash = "sha256-Sg5et+yP6Z44wV/t9zqKLpg1C0cq6rV+3WrzAH4Za3U=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
cargoSha256 = "sha256-s3seKVEhXyOVlt3a8cubzRWoB4SVQpdCmq12y0FpDUw=";
|
cargoSha256 = "sha256-s3seKVEhXyOVlt3a8cubzRWoB4SVQpdCmq12y0FpDUw=";
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -57,7 +66,8 @@ rustPlatform.buildRustPackage rec {
|
||||||
libXi
|
libXi
|
||||||
libXcursor
|
libXcursor
|
||||||
];
|
];
|
||||||
in ''
|
in
|
||||||
|
''
|
||||||
patchelf --set-rpath "${libPath}" "$out/bin/airshipper"
|
patchelf --set-rpath "${libPath}" "$out/bin/airshipper"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue