diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix index 4ebbc9c49923..2281688949c8 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 a06c1b3b6652..5b67b9bce94e 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 {