diff options
| author | Felix Buehler <account@buehler.rocks> | 2021-09-19 16:48:02 +0200 |
|---|---|---|
| committer | Felix Buehler <account@buehler.rocks> | 2021-09-22 17:56:02 +0200 |
| commit | 4226cedf26c6d1bb24523fbfced700c8906ed126 (patch) | |
| tree | 0a0755be237eb3e8e0d1b510388dc01b4188fda9 /pkgs/games/uqm | |
| parent | 4a6c33d2ba7d7b6d51085fa5e976f1b61d87bc44 (diff) | |
uqm-3dovideo: switch to fetchFromGitHub
Diffstat (limited to 'pkgs/games/uqm')
| -rw-r--r-- | pkgs/games/uqm/3dovideo.nix | 12 | ||||
| -rw-r--r-- | pkgs/games/uqm/default.nix | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix index 4ebbc9c499234..2281688949c87 100644 --- a/pkgs/games/uqm/3dovideo.nix +++ b/pkgs/games/uqm/3dovideo.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, requireFile, writeText, fetchurl, haskellPackages }: +{ stdenv, lib, requireFile, writeText, fetchFromGitHub, haskellPackages }: let makeSpin = num: let @@ -13,13 +13,15 @@ let slides.intro = 3DOVID:addons/3dovideo/intro/intro.duk '' + lib.concatMapStrings makeSpin (lib.range 0 24)); - helper = with haskellPackages; mkDerivation { + helper = with haskellPackages; mkDerivation rec { pname = "uqm3donix"; version = "0.1.0.0"; - src = fetchurl { - url = "https://github.com/aszlig/uqm3donix/archive/v0.1.0.0.tar.gz"; - sha256 = "0d40gpc3bqkw68varjxwgbdzxw0dvwqksijmvij5ixmlcspbjgvb"; + src = fetchFromGitHub { + owner = "aszlig"; + repo = "uqm3donix"; + rev = "v${version}"; + hash = "sha256-rK30u2PBysiSGSA9829F1Nom/wtoVN6rGTBneRKeWEw="; }; isLibrary = false; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index a06c1b3b66525..5b67b9bce94ec 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkg-config, libGLU, libGL +{ stdenv, lib, fetchurl, fetchFromGitHub, pkg-config, libGLU, libGL , SDL, SDL_image, libpng, libvorbis, libogg, libmikmod , use3DOVideos ? false, requireFile ? null, writeText ? null @@ -12,7 +12,7 @@ assert use3DOVideos -> requireFile != null && writeText != null let videos = import ./3dovideo.nix { - inherit stdenv lib requireFile writeText fetchurl haskellPackages; + inherit stdenv lib requireFile writeText fetchFromGitHub haskellPackages; }; remixPacks = lib.imap1 (num: sha256: fetchurl rec { |