diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-06 16:01:14 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-06 16:01:14 +0200 |
| commit | c04a14edd6096a2d55d3b62ca182739dac9b7ede (patch) | |
| tree | fdf08d8db024a987c90a1f48e5d2319ddc7e3c1b /pkgs/games/devilutionx/default.nix | |
| parent | 44e3fc61fed2ad05cf1ae7d155172dccd0555465 (diff) | |
| parent | 413e9561f817ae4cbeb870f777ec5a66ab34e76c (diff) | |
| download | nixpkgs-c04a14edd6096a2d55d3b62ca182739dac9b7ede.tar nixpkgs-c04a14edd6096a2d55d3b62ca182739dac9b7ede.tar.gz nixpkgs-c04a14edd6096a2d55d3b62ca182739dac9b7ede.tar.bz2 nixpkgs-c04a14edd6096a2d55d3b62ca182739dac9b7ede.tar.lz nixpkgs-c04a14edd6096a2d55d3b62ca182739dac9b7ede.tar.xz nixpkgs-c04a14edd6096a2d55d3b62ca182739dac9b7ede.tar.zst nixpkgs-c04a14edd6096a2d55d3b62ca182739dac9b7ede.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/games/devilutionx/default.nix')
| -rw-r--r-- | pkgs/games/devilutionx/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 1e88907cc17..af036696c04 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: stdenv.mkDerivation rec { - version = "2020-10-20"; - pname = "devilutionx-unstable"; + pname = "devilutionx"; + version = "unstable-2020-10-20"; src = fetchFromGitHub { owner = "diasurgical"; @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { "-DBINARY_RELEASE=ON" ]; - enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ]; |