diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2022-01-07 13:39:05 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2022-01-31 07:05:54 -0800 |
| commit | 8e691a733f36e383911cea8190cc5bd0e6acdd15 (patch) | |
| tree | eb1e6e735e6b9ac0c631755b9ed26a993eb66f18 /pkgs/applications/networking/aether | |
| parent | 5036591467aa0db4db131dc749a53d5b071e06d5 (diff) | |
Aether: avoid srcs usage, refactor
Diffstat (limited to 'pkgs/applications/networking/aether')
| -rw-r--r-- | pkgs/applications/networking/aether/default.nix | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/pkgs/applications/networking/aether/default.nix b/pkgs/applications/networking/aether/default.nix index ddb137137cf35..5682091237b47 100644 --- a/pkgs/applications/networking/aether/default.nix +++ b/pkgs/applications/networking/aether/default.nix @@ -9,31 +9,27 @@ let binaryName = "AetherP2P"; + aether-app-git = fetchFromGitHub { + owner = "aethereans"; + repo = "aether-app"; + rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d"; + sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r"; + }; in stdenv.mkDerivation rec { pname = "aether"; version = "2.0.0-dev.15"; - srcs = [ - (fetchurl { - url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz"; - sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7"; - # % in the url / canonical filename causes an error - name = "aether-tarball.tar.gz"; - }) - (fetchFromGitHub { - owner = "aethereans"; - repo = "aether-app"; - rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d"; - sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r"; - }) - ]; - - sourceRoot = "Aether-${version}+2011262249.19338c93"; + src = fetchurl { + url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz"; + sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7"; + # % in the url / canonical filename causes an error + name = "aether-tarball.tar.gz"; + }; # there is no logo in the tarball so we grab it from github and convert it in the build phase buildPhase = '' - convert ../source/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png + convert ${aether-app-git}/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png ''; dontWrapGApps = true; |