diff options
| author | Peter Hoeg <peter@hoeg.com> | 2022-03-21 14:33:25 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2022-03-25 19:30:11 +0800 |
| commit | 28a3079831a92096b1fd45c18ad55453f14695dd (patch) | |
| tree | 57a49dec82ab1c08cea3bcca8e6a121802204f19 /pkgs/games | |
| parent | d31b9b0052be8cd25531d9353e8e275efb0d9e2c (diff) | |
| download | nixlib-28a3079831a92096b1fd45c18ad55453f14695dd.tar nixlib-28a3079831a92096b1fd45c18ad55453f14695dd.tar.gz nixlib-28a3079831a92096b1fd45c18ad55453f14695dd.tar.bz2 nixlib-28a3079831a92096b1fd45c18ad55453f14695dd.tar.lz nixlib-28a3079831a92096b1fd45c18ad55453f14695dd.tar.xz nixlib-28a3079831a92096b1fd45c18ad55453f14695dd.tar.zst nixlib-28a3079831a92096b1fd45c18ad55453f14695dd.zip | |
airshipper: add libGL to get gfx debug output
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/airshipper/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/games/airshipper/default.nix.orig | 84 |
2 files changed, 88 insertions, 3 deletions
diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index 4474d09659e5..4fc37b0ca25c 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -3,6 +3,7 @@ , fetchFromGitLab , fetchpatch , openssl +, libGL , vulkan-loader , wayland , wayland-protocols @@ -49,14 +50,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config makeWrapper ]; postInstall = '' - mkdir -p "$out/share/applications" && mkdir -p "$out/share/icons" - cp "client/assets/net.veloren.airshipper.desktop" "$out/share/applications" - cp "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico" + install -Dm444 -t "$out/share/applications" "client/assets/net.veloren.airshipper.desktop" + install -Dm444 "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico" ''; postFixup = let libPath = lib.makeLibraryPath [ + libGL vulkan-loader wayland wayland-protocols diff --git a/pkgs/games/airshipper/default.nix.orig b/pkgs/games/airshipper/default.nix.orig new file mode 100644 index 000000000000..4474d09659e5 --- /dev/null +++ b/pkgs/games/airshipper/default.nix.orig @@ -0,0 +1,84 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, fetchpatch +, openssl +, vulkan-loader +, wayland +, wayland-protocols +, libxkbcommon +, libX11 +, libXrandr +, libXi +, libXcursor +, pkg-config +, makeWrapper +}: + +rustPlatform.buildRustPackage rec { + pname = "airshipper"; + version = "0.7.0"; + + src = fetchFromGitLab { + owner = "Veloren"; + repo = "airshipper"; + rev = "v${version}"; + 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 = [ + openssl + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXi + libXcursor + ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + + postInstall = '' + mkdir -p "$out/share/applications" && mkdir -p "$out/share/icons" + cp "client/assets/net.veloren.airshipper.desktop" "$out/share/applications" + cp "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico" + ''; + + postFixup = + let + libPath = lib.makeLibraryPath [ + vulkan-loader + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXi + libXcursor + ]; + in + '' + patchelf --set-rpath "${libPath}" "$out/bin/airshipper" + ''; + + doCheck = false; + cargoBuildFlags = [ "--package" "airshipper" ]; + cargoTestFlags = [ "--package" "airshipper" ]; + + meta = with lib; { + description = "Provides automatic updates for the voxel RPG Veloren."; + homepage = "https://www.veloren.net"; + license = licenses.gpl3; + maintainers = with maintainers; [ yusdacra ]; + }; +} |