JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uqm: Switch to using fetchurl for uqm3donix.

Browse Source 
As we now have a tagged first release, it really doesn't make sense to
introduce additional dependencies by using fetchgit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2013-08-15 09:34:40 +02:00
parent 857cfb4c03
commit 7e2587561d
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, requireFile, writeText, fetchgit, haskellPackages }: { stdenv, requireFile, writeText, fetchurl, haskellPackages }:
with stdenv.lib; with stdenv.lib;
@ -19,10 +19,9 @@ let
pname = "uqm3donix"; pname = "uqm3donix";
version = "0.1.0.0"; version = "0.1.0.0";
src = fetchgit { src = fetchurl {
url = "git://github.com/aszlig/uqm3donix.git"; url = "https://github.com/aszlig/uqm3donix/archive/v0.1.0.0.tar.gz";
rev = "c4e43b0d2eeb15e4caa93b0ddcf6b886d1cdaf8f"; sha256 = "0d40gpc3bqkw68varjxwgbdzxw0dvwqksijmvij5ixmlcspbjgvb";
sha256 = "15vkgqsnwqn758nb3b55gbk5fw49lakax344sj9gvkpn8vxjn10y";
}; };
isLibrary = false; isLibrary = false;

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

@ -2,15 +2,15 @@
, pkgconfig, mesa , pkgconfig, mesa
, SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod, unzip , SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod, unzip
, use3DOVideos ? false, requireFile ? null, writeText ? null , use3DOVideos ? false, requireFile ? null, writeText ? null
, fetchgit ? null, haskellPackages ? null , haskellPackages ? null
}: }:
assert use3DOVideos -> requireFile != null && writeText != null assert use3DOVideos -> requireFile != null && writeText != null
&& fetchgit != null && haskellPackages != null; && haskellPackages != null;
let let
videos = import ./3dovideo.nix { videos = import ./3dovideo.nix {
inherit stdenv requireFile writeText fetchgit haskellPackages; inherit stdenv requireFile writeText fetchurl haskellPackages;
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "uqm-${version}"; name = "uqm-${version}";