quake3demodata: split from point release, cleanup

pkgs/games/quake3/content/demo.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+let
+  version = "1.11-6";
+in stdenv.mkDerivation {
+  name = "quake3-demodata-${version}";
+
+  src = fetchurl {
+    url = "http://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh";
+    sha256 = "1v54a1hx1bczk9hgn9qhx8vixsy7xn7wj2pylhfjsybfkgvf7pk4";
+  };
+
+  buildCommand = ''
+    tail -n +165 $src | tar xfz -
+
+    mkdir -p $out/baseq3
+    cp demoq3/*.pk3 $out/baseq3
+  '';
+
+  preferLocalBuild = true;
+
+  meta = with stdenv.lib; {
+    description = "Quake 3 Arena demo content";
+    license = licenses.unfreeRedistributable;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

pkgs/games/quake3/demo/builder.sh

@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-tail -n +165 $demo | tar xvfz -
-chmod -R +w .
-tail -n +175 $update | tar xvfz -
-chmod -R +w .
-
-mkdir -p $out/baseq3
-cp demoq3/*.pk3 baseq3/*.pk3 $out/baseq3

pkgs/games/quake3/demo/default.nix

@@ -1,24 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "quake3demo-1.11-6";
-  builder = ./builder.sh;
-
-  # This is needed for pak0.pk3.
-  demo = fetchurl {
-    url = http://tarballs.nixos.org/linuxq3ademo-1.11-6.x86.gz.sh;
-    sha256 = "1v54a1hx1bczk9hgn9qhx8vixsy7xn7wj2pylhfjsybfkgvf7pk4";
-  };
-
-  # This is needed for the additional pak?.pk3 files.
-  update = fetchurl {
-    url = http://tarballs.nixos.org/linuxq3apoint-1.31.x86.run;
-    sha256 = "1kp689452zb8jhd67ghisz2055pqxy9awz4vi0hq5qmp7xrp1x58";
-  };
-
-  # Don't rebuild if the inputs change, since the output is guaranteed
-  # to be this value.
-  outputHashMode = "recursive";
-  outputHashAlgo = "sha256";
-  outputHash = "00453c43a4jnlbm9w9ws1hdi28hkl63xnxbnbqml25h35ckhzs90";
-}

pkgs/top-level/all-packages.nix

@@ -14260,10 +14260,10 @@ let
     name = "quake3-demo-${ioquake3.name}";
     description = "Demo of Quake 3 Arena, a classic first-person shooter";
     game = ioquake3;
-    paks = [quake3demodata];
+    paks = [ quake3pointrelease quake3demodata ];
   };
 
-  quake3demodata = callPackage ../games/quake3/demo { };
+  quake3demodata = callPackage ../games/quake3/content/demo.nix { };
 
   quake3pointrelease = callPackage ../games/quake3/content/pointrelease.nix { };