diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2013-10-28 00:09:46 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2013-10-28 00:09:46 +0400 |
| commit | 3022fff7db8c9649d9502de3e60a09c97dc27b61 (patch) | |
| tree | e4ce576eb17d11f7e5c489ec4e8a2be21e1f8dbf | |
| parent | 59de62317dbc5270eafd00503c9633af60eb590b (diff) | |
| download | nixlib-3022fff7db8c9649d9502de3e60a09c97dc27b61.tar nixlib-3022fff7db8c9649d9502de3e60a09c97dc27b61.tar.gz nixlib-3022fff7db8c9649d9502de3e60a09c97dc27b61.tar.bz2 nixlib-3022fff7db8c9649d9502de3e60a09c97dc27b61.tar.lz nixlib-3022fff7db8c9649d9502de3e60a09c97dc27b61.tar.xz nixlib-3022fff7db8c9649d9502de3e60a09c97dc27b61.tar.zst nixlib-3022fff7db8c9649d9502de3e60a09c97dc27b61.zip | |
Adding Quantum Minigolf game
| -rw-r--r-- | nixos/modules/services/networking/vsftpd.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/quantumminigolf/default.nix | 40 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 43 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index d9f1e96b1d23..0a6355e6ff17 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -75,7 +75,7 @@ let { cfgText = if cfg.rsaCertFile == null then "" else '' - sslEnable=YES + ssl_enable=YES rsa_cert_file=${cfg.rsaCertFile} ''; diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/games/quantumminigolf/default.nix new file mode 100644 index 000000000000..940351790166 --- /dev/null +++ b/pkgs/games/quantumminigolf/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, fftwSinglePrec, freetype, SDL, SDL_ttf}: +let + s = # Generated upstream information + rec { + baseName="quantumminigolf"; + version="1.1.1"; + name="${baseName}-${version}"; + hash="16av7fk0irhi5nd7y9h9vhb0kf0dk12p6976ai3f60m99qdd8wk3"; + url="mirror://sourceforge/project/quantumminigolf/quantumminigolf/1.1.1/quantumminigolf-1.1.1.src.tar.gz"; + sha256="16av7fk0irhi5nd7y9h9vhb0kf0dk12p6976ai3f60m99qdd8wk3"; + }; + buildInputs = [ + fftwSinglePrec freetype SDL SDL_ttf + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + preBuild = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL" + + sed -re 's@"(gfx|fonts|tracks)/@"'"$out"'/share/quantumminigolf/\1/@g' -i *.cpp + ''; + installPhase = '' + mkdir -p "$out"/{share/doc,share/quantumminigolf,bin} + cp README THANKS LICENSE "$out/share/doc" + cp -r fonts gfx tracks "$out/share/quantumminigolf" + cp quantumminigolf "$out/bin" + ''; + meta = { + inherit (s) version; + description = ''Quantum mechanics-based minigolf-like game''; + license = stdenv.lib.licenses.gpl2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c13002273e4..f81c20a6b4bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9293,6 +9293,8 @@ let quake3game = callPackage ../games/quake3/game { }; + quantumminigolf = callPackage ../games/quantumminigolf {}; + racer = callPackage ../games/racer { }; residualvm = callPackage ../games/residualvm { |