diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/games/blobby | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/games/blobby')
| -rw-r--r-- | nixpkgs/pkgs/games/blobby/blobby.sh | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/games/blobby/default.nix | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/games/blobby/blobby.sh b/nixpkgs/pkgs/games/blobby/blobby.sh index 4c4b32b12433..3171c5a80b1b 100644 --- a/nixpkgs/pkgs/games/blobby/blobby.sh +++ b/nixpkgs/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/nixpkgs/pkgs/games/blobby/default.nix b/nixpkgs/pkgs/games/blobby/default.nix index 9dad0b84d1e3..68e18dfe26dd 100644 --- a/nixpkgs/pkgs/games/blobby/default.nix +++ b/nixpkgs/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"; }; } |