diff options
author | Artturin <Artturin@artturin.com> | 2022-05-17 22:10:33 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2022-05-23 17:18:50 +0300 |
commit | b3caa2f1fed4526fa0d6744c353f3c7678d4bb40 (patch) | |
tree | 075c7d92742b89b428aae317196c1e0f2dcc1dc7 /pkgs/games/openra | |
parent | 5a6a31e54ddaf59aa8e1c5e7e9b02623d4881c34 (diff) |
treewide: extraPostFetch -> postFetch
Diffstat (limited to 'pkgs/games/openra')
-rw-r--r-- | pkgs/games/openra/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/openra/engines.nix | 4 | ||||
-rw-r--r-- | pkgs/games/openra/mods.nix | 28 | ||||
-rw-r--r-- | pkgs/games/openra/packages.nix | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index 22d3c6c879ed0..d996630914740 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -43,7 +43,7 @@ let callWithName = name: value: if isFunction value then value name else value; buildOpenRASet = f: args: pkgs.recurseIntoAttrs (mapAttrs callWithName (f ({ inherit (pkgs) fetchFromGitHub; - extraPostFetch = '' + postFetch = '' sed -i 's/curl/curl --insecure/g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh $out/thirdparty/fetch-thirdparty-deps.sh ''; diff --git a/pkgs/games/openra/engines.nix b/pkgs/games/openra/engines.nix index 933f8411f75a0..bbb4947acd237 100644 --- a/pkgs/games/openra/engines.nix +++ b/pkgs/games/openra/engines.nix @@ -1,4 +1,4 @@ -{ buildOpenRAEngine, fetchFromGitHub, extraPostFetch }: +{ buildOpenRAEngine, fetchFromGitHub, postFetch }: let buildUpstreamOpenRAEngine = { version, rev, sha256 }: name: (buildOpenRAEngine { @@ -9,7 +9,7 @@ let src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; - inherit rev sha256 extraPostFetch; + inherit rev sha256 postFetch; }; } name).overrideAttrs (origAttrs: { postInstall = '' diff --git a/pkgs/games/openra/mods.nix b/pkgs/games/openra/mods.nix index cf8cd433c2942..47e86fd09a7d2 100644 --- a/pkgs/games/openra/mods.nix +++ b/pkgs/games/openra/mods.nix @@ -1,4 +1,4 @@ -{ buildOpenRAMod, fetchFromGitHub, extraPostFetch }: +{ buildOpenRAMod, fetchFromGitHub, postFetch }: let unsafeBuildOpenRAMod = attrs: name: (buildOpenRAMod attrs name).overrideAttrs (_: { @@ -25,7 +25,7 @@ in { rev = "b8a7dd52ff893ed8225726d4ed4e14ecad748404"; sha256 = "0dyk861qagibx8ldshz7d2nrki9q550f6f0wy8pvayvf1gv1dbxj"; name = "engine"; - inherit extraPostFetch; + inherit postFetch; }; }; }; @@ -50,7 +50,7 @@ in { rev = version; sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r"; name = "engine"; - inherit extraPostFetch; + inherit postFetch; }; }; assetsError = '' @@ -78,7 +78,7 @@ in { rev = "f91d3f2603bbf51afaa89357e4defcdc36138102"; sha256 = "05g900ri6q0zrkrk8rmjaz576vjggmi2y6jm0xz3cwli54prn11w"; name = "engine"; - inherit extraPostFetch; + inherit postFetch; }; }; }; @@ -102,7 +102,7 @@ in { rev = version; sha256 = "1x6byz37s8qcpqj902zvkvbv95rv2mv2kj35c12gbpyc92xkqkq0"; name = "generals-alpha-engine"; - inherit extraPostFetch; + inherit postFetch; }; }; }; @@ -127,7 +127,7 @@ in { rev = "4e8eab4ca00d1910203c8a103dfd2c002714daa8"; sha256 = "1yyqparf93x8yzy1f46gsymgkj5jls25v2yc7ighr3f7mi3igdvq"; name = "engine"; - inherit extraPostFetch; + inherit postFetch; }; }; } name).overrideAttrs (origAttrs: { @@ -156,7 +156,7 @@ in { rev = "52109c0910f479753704c46fb19e8afaab353c83"; sha256 = "0ga3855j6bc7h81q03cw6laiaiz12915zg8aqah1idvxbzicfy7l"; name = "engine"; - inherit extraPostFetch; + inherit postFetch; }; }; }; @@ -180,7 +180,7 @@ in { rev = version; sha256 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5"; name = "engine"; - inherit extraPostFetch; + inherit postFetch; }; }; assetsError = '' @@ -208,7 +208,7 @@ in { rev = version; sha256 = "15pvn5cx3g0nzbrgpsfz8dngad5wkzp5dz25ydzn8bmxafiijvcr"; name = "engine"; - inherit extraPostFetch; + inherit postFetch; }; }; }; @@ -233,7 +233,7 @@ in { rev = "f3873ae242803051285994d77eb26f4b951594b5"; sha256 = "02rv29wja0p5d083pd087daz7x7pp5b9ym7sci2fhg3mrnaqgwkp"; name = "engine"; - inherit extraPostFetch; + inherit postFetch; }; }; assetsError = '' @@ -262,7 +262,7 @@ in { rev = "bb0930008a57c07f3002421023f6b446e3e3af69"; sha256 = "1jvgpbf56hd02ikhklv49br4d1jiv5hphc5kl79qnjlaacnj222x"; name = "engine"; - inherit extraPostFetch; + inherit postFetch; }; }; }; @@ -286,7 +286,7 @@ in { rev = "6de92de8d982094a766eab97a92225c240d85493"; sha256 = "0ps9x379plrrj1hnj4fpr26lc46mzgxknv5imxi0bmrh5y4781ql"; name = "engine"; - inherit extraPostFetch; + inherit postFetch; }; }; }; @@ -310,7 +310,7 @@ in { rev = version; sha256 = "1p5hgxxvxlz8480vj0qkmnxjh7zj3hahk312m0zljxfdb40652w1"; name = "engine"; - inherit extraPostFetch; + inherit postFetch; }; }; }; @@ -334,7 +334,7 @@ in { rev = version; sha256 = "15pvn5cx3g0nzbrgpsfz8dngad5wkzp5dz25ydzn8bmxafiijvcr"; name = "engine"; - inherit extraPostFetch; + inherit postFetch; }; }; assetsError = '' diff --git a/pkgs/games/openra/packages.nix b/pkgs/games/openra/packages.nix index 2f4c83c7d5a32..e98ebcaee44fb 100644 --- a/pkgs/games/openra/packages.nix +++ b/pkgs/games/openra/packages.nix @@ -32,7 +32,7 @@ let */ buildOpenRASet = f: args: builtins.mapAttrs (name: value: if builtins.isFunction value then value name else value) (f ({ inherit (pkgs) fetchFromGitHub; - extraPostFetch = '' + postFetch = '' sed -i 's/curl/curl --insecure/g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh $out/thirdparty/fetch-thirdparty-deps.sh ''; |