diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2022-12-12 18:01:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-12 18:01:18 +0000 |
| commit | d142894c01166101117317aecee5db8bc81ecf0c (patch) | |
| tree | bcf58d980a338de23b3022d038a7ed220840b964 | |
| parent | Merge pull request #205788 from NixOS/backport-205785-to-release-22.11 (diff) | |
| parent | blobby: repair (diff) | |
| download | nixpkgs-d142894c01166101117317aecee5db8bc81ecf0c.tar.gz | |
Merge pull request #205801 from AleXoundOS/blobby-fix
blobby: repair
| -rw-r--r-- | pkgs/games/blobby/blobby.sh | 2 | ||||
| -rw-r--r-- | pkgs/games/blobby/default.nix | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/games/blobby/blobby.sh b/pkgs/games/blobby/blobby.sh index 4c4b32b12433..3171c5a80b1b 100644 --- a/pkgs/games/blobby/blobby.sh +++ b/pkgs/games/blobby/blobby.sh @@ -7,4 +7,4 @@ test -d ~/.blobby || { ( cd ~/.blobby; for i in *.zip; do @unzip@/bin/unzip "$i"; done ) } -@out@/bin/blobby.bin +exec @out@/bin/blobby.bin "$@" diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 9dad0b84d1e3..68e18dfe26dd 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib, pkg-config }: +{ lib, stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib, unzip, pkg-config }: stdenv.mkDerivation rec { pname = "blobby-volley"; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { sed -e '1i#include <iostream>' -i src/NetworkMessage.cpp ''; + inherit unzip; + postInstall = '' cp ../data/Icon.bmp "$out/share/blobby/" mv "$out/bin"/blobby{,.bin} @@ -28,7 +30,8 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ raskin ]; - homepage = "http://blobby.sourceforge.net/"; + homepage = "https://blobbyvolley.de/"; downloadPage = "https://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/"; + mainProgram = "blobby"; }; } |