flare: refactor meta and pname (#414025)

pkgs/by-name/fl/flare/engine.nix

@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "flareteam";
-    repo = pname;
-    rev = "v${version}";
+    repo = "flare-engine";
+    tag = "v${version}";
     hash = "sha256-DIzfTqwZJ8NAPB/TWzvPjepHb7hIbIr+Kk+doXJmpLc=";
   };
 
@@ -30,14 +30,14 @@ stdenv.mkDerivation rec {
     SDL2_ttf
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Free/Libre Action Roleplaying Engine";
     homepage = "https://github.com/flareteam/flare-engine";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       aanderse
       McSinyx
     ];
-    license = [ licenses.gpl3 ];
-    platforms = platforms.unix;
+    license = [ lib.licenses.gpl3Plus ];
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/fl/flare/game.nix

@@ -11,21 +11,21 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "flareteam";
-    repo = pname;
-    rev = "v${version}";
+    repo = "flare-game";
+    tag = "v${version}";
     hash = "sha256-tINIwxyQn8eeJCHwRmAMo2TYRgrgJlGaUrnrgbmM3Jo=";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     description = "Fantasy action RPG using the FLARE engine";
     homepage = "https://github.com/flareteam/flare-game";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       aanderse
       McSinyx
     ];
-    license = [ licenses.cc-by-sa-30 ];
-    platforms = platforms.unix;
+    license = [ lib.licenses.cc-by-sa-30 ];
+    platforms = lib.platforms.unix;
   };
 }