From d2c084830a5cef2b929373f0acb3c86b45d60c03 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 10:45:31 +0200 Subject: [PATCH 01/12] 90secondportraits: deprecate phases --- pkgs/games/90secondportraits/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index a5b504995f7..07458cc6446 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love ]; - phases = "installPhase"; + dontUnpack = true; installPhase = '' From c77f8555c47b81f54e250a33fa784c4f6c175468 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 10:45:48 +0200 Subject: [PATCH 02/12] anki: deprecate phases --- pkgs/games/anki/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 6edddfeed5c..d1def374009 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -48,7 +48,7 @@ let rev = rev-manual; sha256 = sha256-manual; }; - phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; + dontInstall = true; nativeBuildInputs = [ asciidoc ]; patchPhase = '' # rsync isnt needed From 816a29f9c4e54593b4207cca13308fc7fd715253 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 10:46:05 +0200 Subject: [PATCH 03/12] duckmarines: deprecate phases --- pkgs/games/duckmarines/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index ca2a7439141..af34742b9fd 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' From a7d44252c30b0f81fa059c0422c2e9ead4f9d2ec Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 10:47:55 +0200 Subject: [PATCH 04/12] dwarf-fortress: remove phases --- pkgs/games/dwarf-fortress/soundsense.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index 5202c13b5b8..8ed1e7be1b2 100644 --- a/pkgs/games/dwarf-fortress/soundsense.nix +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { url = "http://df.zweistein.cz/soundsense/soundSense_${version}.zip"; sha256 = "1gkrs69l3xsh858yjp204ddp29m668j630akm7arssc9359wxqkk"; }; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; nativeBuildInputs = [ dos2unix ]; buildPhase = '' dos2unix soundSense.sh From 4911c06d52654015769fd7d371842d563b2296c5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 10:48:14 +0200 Subject: [PATCH 05/12] mari0: remove phases --- pkgs/games/mari0/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix index cb3349960f0..55ef9f51d5b 100644 --- a/pkgs/games/mari0/default.nix +++ b/pkgs/games/mari0/default.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love_11 zip ]; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/bin $out/share/games/lovegames $out/share/applications From 96dfb5fa712a8b91a47aac453e740421e8974f1d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 10:48:34 +0200 Subject: [PATCH 06/12] mrrescue: deprecate phases --- pkgs/games/mrrescue/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index ae7519c948b..2328c20ef91 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ lua love makeWrapper ]; - phases = "installPhase"; + dontUnpack = true; installPhase = '' From 6c9e39afa09047b5b6e300a31939de3bc5767a83 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 10:48:50 +0200 Subject: [PATCH 07/12] nottetris2: remove phases --- pkgs/games/nottetris2/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/games/nottetris2/default.nix b/pkgs/games/nottetris2/default.nix index 42e5a33cad7..179673c05b6 100644 --- a/pkgs/games/nottetris2/default.nix +++ b/pkgs/games/nottetris2/default.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ zip makeWrapper ]; buildInputs = [ love_0_7 ]; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/bin $out/share/games/lovegames $out/share/applications From 4dafca2c7a9baf8dad4fbfa8769321ca75484d04 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 10:49:09 +0200 Subject: [PATCH 08/12] rimshot: remove phases --- pkgs/games/rimshot/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix index 1f4efa5097b..997da768c6d 100644 --- a/pkgs/games/rimshot/default.nix +++ b/pkgs/games/rimshot/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ lua love ]; - phases = [ "unpackPhase" "installPhase" ]; - unpackPhase = '' unzip -j $src ''; From 1b7a0e8dbb0330ca134a155edbb4382b61b4bd5e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 10:49:27 +0200 Subject: [PATCH 09/12] scrolls: remove phases --- pkgs/games/scrolls/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index cdeab7b10d3..fad783571c5 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation { libpulseaudio ]; - phases = [ "unpackPhase" "installPhase" ]; installPhase = '' mkdir -p "$out/opt/Scrolls" cp -r ../Scrolls "$out/opt/Scrolls/" From b2071530e297dc29bbe01b34ef080e4a5bf8e9d5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 10:50:01 +0200 Subject: [PATCH 10/12] sienna: deprecate phases --- pkgs/games/sienna/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index 24f5fc08876..59f01f6a2c4 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love ]; - phases = "installPhase"; + dontUnpack = true; installPhase = '' From 76fff62cad8b4e907aa5bcd54cb8d36ff55a9ab5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 10:50:22 +0200 Subject: [PATCH 11/12] vapor: deprecate phases --- pkgs/games/vapor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix index 71028065263..2fa7ca18927 100644 --- a/pkgs/games/vapor/default.nix +++ b/pkgs/games/vapor/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love ]; - phases = "installPhase"; + dontUnpack = true; installPhase = '' From 11ba3977529b545298f8311ad9ef7a53140710f8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 10:50:40 +0200 Subject: [PATCH 12/12] flightgear: deprecate phases --- pkgs/games/flightgear/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 0996d4bd512..bfbb705da38 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -17,7 +17,7 @@ let sha256 = "sha256-/KFumHRkmRvsU/L1i11jG/KbqobnOEP7l4lyPMKHycA="; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p "$out/share/FlightGear"