alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #144999 from aanderse/devilutionx

Browse source 
devilutionx: minor cleanup after review
This commit is contained in:
Thiago Kenji Okada 2021-11-09 11:28:07 -03:00 committed by GitHub
parent e5b9df9a46 6c2190f398
commit 1ffd57e92b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/smpq/default.nix
View file

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, cmake, StormLib }: { lib, stdenv, fetchurl, cmake, StormLib }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "smpq"; pname = "smpq";
version = "1.6"; version = "1.6";
src = fetchurl { src = fetchurl {
url = "https://launchpad.net/smpq/trunk/1.6/+download/smpq_1.6.orig.tar.gz"; url = "https://launchpad.net/smpq/trunk/${version}/+download/${pname}_${version}.orig.tar.gz";
sha256 = "1jqq5x3b17jy66x3kkf5hs5l322dx2v14djxxrqrnqp8bn5drlmm"; sha256 = "1jqq5x3b17jy66x3kkf5hs5l322dx2v14djxxrqrnqp8bn5drlmm";
}; };

2
pkgs/games/devilutionx/default.nix
View file

@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
fmt fmt
libpng libpng
(SDL2.override { withStatic = true; }) SDL2
SDL2_image SDL2_image
]; ];

6
pkgs/top-level/all-packages.nix
View file

@ -29831,7 +29831,11 @@ with pkgs;
ddnet = callPackage ../games/ddnet { }; ddnet = callPackage ../games/ddnet { };
devilutionx = callPackage ../games/devilutionx {}; devilutionx = callPackage ../games/devilutionx {
SDL2 = SDL2.override {
withStatic = true;
};
};
dhewm3 = callPackage ../games/dhewm3 {}; dhewm3 = callPackage ../games/dhewm3 {};