diff options
author | Pascal Bach <pascal.bach@nextrem.ch> | 2022-03-18 22:29:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-18 22:29:17 +0100 |
commit | b8522e27a1a7b3b1732f2a5288950c42407702a1 (patch) | |
tree | d2a9830f5375a68df559143a9404a491703b2871 | |
parent | c4bdaaad70dd67878b9c76aba1c1d2b3cb071896 (diff) | |
parent | 3320a62eb3a90a1bca4bdac5c7a2c220842e2568 (diff) | |
download | nixlib-b8522e27a1a7b3b1732f2a5288950c42407702a1.tar nixlib-b8522e27a1a7b3b1732f2a5288950c42407702a1.tar.gz nixlib-b8522e27a1a7b3b1732f2a5288950c42407702a1.tar.bz2 nixlib-b8522e27a1a7b3b1732f2a5288950c42407702a1.tar.lz nixlib-b8522e27a1a7b3b1732f2a5288950c42407702a1.tar.xz nixlib-b8522e27a1a7b3b1732f2a5288950c42407702a1.tar.zst nixlib-b8522e27a1a7b3b1732f2a5288950c42407702a1.zip |
Merge pull request #164688 from peterhoeg/f/airshipper
airshipper: work around deprecated names
-rw-r--r-- | pkgs/games/airshipper/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index bc6f2a8dc71e..4474d09659e5 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitLab +, fetchpatch , openssl , vulkan-loader , wayland @@ -25,6 +26,14 @@ rustPlatform.buildRustPackage rec { 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="; buildInputs = [ @@ -57,7 +66,8 @@ rustPlatform.buildRustPackage rec { libXi libXcursor ]; - in '' + in + '' patchelf --set-rpath "${libPath}" "$out/bin/airshipper" ''; |