diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-07-21 15:41:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 15:41:22 +0100 |
| commit | 218298b30fe79be30716438a1906d1abd61b9377 (patch) | |
| tree | 65e0041ee5468689142d669c4c4fc4f73f3618ba /pkgs/games | |
| parent | cd6e2c9642b8e608c905f350cece21141435deef (diff) | |
| parent | e85db6863a546cfdde0150f03ed0d2db28992575 (diff) | |
| download | nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.gz nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.bz2 nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.lz nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.xz nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.zst nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.zip | |
Merge branch 'master' into unused5
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/commandergenius/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/dxx-rebirth/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 2abc46690e9..45be0a3085e 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "commandergenius-${version}"; - version = "2.2.0"; + version = "2.2.2"; src = fetchFromGitHub { owner = "gerstrong"; repo = "Commander-Genius"; rev = "v${version}"; - sha256 = "1hjx4j325vj1ayxi3j2dpplpd3x0iqx98gyb093ld7dfnsyilbph"; + sha256 = "1mfw25pgr492ayqw3b85mwp20wh6anrr90gdy605nv1yjma62pmj"; }; buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ]; diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index 9dde1da868d..e48ac612b32 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; buildPhase = '' runHook preBuild |