nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

uqm-3dovideo: switch to fetchFromGitHub

Browse Source
This commit is contained in:
Felix Buehler 2021-09-19 16:48:02 +02:00
parent 4a6c33d2ba
commit 4226cedf26
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/games/uqm/3dovideo.nix
View File

@ -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;

4
pkgs/games/uqm/default.nix
View File

@ -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 {