From da8923a825594bfba0393ca64dd0f2da5a092fdd Mon Sep 17 00:00:00 2001 From: Taylor Gunnoe Date: Wed, 24 Mar 2021 16:30:26 -0400 Subject: [PATCH 1/2] maintainers: add tgunnoe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 54c7d5e9e5ca..0974dbd14224 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9469,6 +9469,12 @@ githubId = 378734; name = "TG ⊗ Θ"; }; + tgunnoe = { + email = "t@gvno.net"; + github = "tgunnoe"; + githubId = 7254833; + name = "Taylor Gunnoe"; + }; th0rgal = { email = "thomas.marchand@tuta.io"; github = "Th0rgal"; From 290b04c5a8cfc4fad000364139145b3e9fe6f83b Mon Sep 17 00:00:00 2001 From: tgunnoe Date: Sun, 23 Jan 2022 12:45:11 -0500 Subject: [PATCH 2/2] lzwolf: init at unstable-2022-01-04 --- pkgs/games/lzwolf/default.nix | 44 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/games/lzwolf/default.nix diff --git a/pkgs/games/lzwolf/default.nix b/pkgs/games/lzwolf/default.nix new file mode 100644 index 000000000000..4faa7419b7ab --- /dev/null +++ b/pkgs/games/lzwolf/default.nix @@ -0,0 +1,44 @@ +{ stdenv, lib, fetchFromBitbucket, p7zip, cmake +, SDL2, bzip2, zlib, libjpeg +, libsndfile, mpg123 +, SDL2_net, SDL2_mixer }: + +stdenv.mkDerivation rec { + pname = "lzwolf"; + version = "unstable-2022-01-04"; + + src = fetchFromBitbucket { + owner = "linuxwolf6"; + repo = "lzwolf"; + rev = "6e470316382b87378966f441e233760ce0ff478c"; + sha256 = "sha256-IbZleY2FPyW3ORIGO2YFXQyAf1l9nDthpJjEKTTsilM="; + }; + nativeBuildInputs = [ p7zip cmake ]; + buildInputs = [ + SDL2 bzip2 zlib libjpeg SDL2_mixer SDL2_net libsndfile mpg123 + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DGPL=ON" + ]; + + doCheck = true; + + installPhase = '' + install -Dm755 lzwolf "$out/lib/lzwolf/lzwolf" + for i in *.pk3; do + install -Dm644 "$i" "$out/lib/lzwolf/$i" + done + mkdir -p $out/bin + ln -s $out/lib/lzwolf/lzwolf $out/bin/lzwolf + ''; + + meta = with lib; { + homepage = "https://bitbucket.org/linuxwolf6/lzwolf"; + description = "Enhanced fork of ECWolf, a Wolfenstein 3D source port"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ tgunnoe ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0b90828b87d..ffcbc0f21b2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6276,6 +6276,8 @@ in lzop = callPackage ../tools/compression/lzop { }; + lzwolf = callPackage ../games/lzwolf { }; + macchanger = callPackage ../os-specific/linux/macchanger { }; madlang = haskell.lib.justStaticExecutables haskellPackages.madlang;