Merge pull request #144999 from aanderse/devilutionx

devilutionx: minor cleanup after review

pkgs/applications/misc/smpq/default.nix

···
 { lib, stdenv, fetchurl, cmake, StormLib }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "smpq";
   version = "1.6";
 
   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";
   };
 

pkgs/games/devilutionx/default.nix

···
   buildInputs = [
     fmt
     libpng
-    (SDL2.override { withStatic = true; })
+    SDL2
     SDL2_image
   ];
 

pkgs/top-level/all-packages.nix

···
 
   ddnet = callPackage ../games/ddnet { };
 
-  devilutionx = callPackage ../games/devilutionx {};
+  devilutionx = callPackage ../games/devilutionx {
+    SDL2 = SDL2.override {
+      withStatic = true;
+    };
+  };
 
   dhewm3 = callPackage ../games/dhewm3 {};