mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 15:43:00 +00:00
uqm: Fix evaluation of 3DO video package
Regression introduced by 2e34288f0d
.
The commit in question just used the "lib" attribute, but it wasn't in
scope. In addition to bringeng the lib attribute into scope, I also
removed the "with lib;", which should make sure that we get an error
when just parsing (nix-instantiate --parse) the Nix expression.
Signed-off-by: aszlig <aszlig@nix.build>
This commit is contained in:
parent
9e9e240a27
commit
2f30e32121
@ -1,10 +1,8 @@
|
|||||||
{ stdenv, requireFile, writeText, fetchurl, haskellPackages }:
|
{ stdenv, lib, requireFile, writeText, fetchurl, haskellPackages }:
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
let
|
||||||
makeSpin = num: let
|
makeSpin = num: let
|
||||||
padded = (optionalString (lessThan num 10) "0") + toString num;
|
padded = (lib.optionalString (lib.lessThan num 10) "0") + toString num;
|
||||||
in "slides.spins.${padded} = 3DOVID:" +
|
in "slides.spins.${padded} = 3DOVID:" +
|
||||||
"addons/3dovideo/spins/ship${padded}.duk:" +
|
"addons/3dovideo/spins/ship${padded}.duk:" +
|
||||||
"addons/3dovideo/spins/spin.aif:" +
|
"addons/3dovideo/spins/spin.aif:" +
|
||||||
@ -13,7 +11,7 @@ let
|
|||||||
videoRMP = writeText "3dovideo.rmp" (''
|
videoRMP = writeText "3dovideo.rmp" (''
|
||||||
slides.ending = 3DOVID:addons/3dovideo/ending/victory.duk
|
slides.ending = 3DOVID:addons/3dovideo/ending/victory.duk
|
||||||
slides.intro = 3DOVID:addons/3dovideo/intro/intro.duk
|
slides.intro = 3DOVID:addons/3dovideo/intro/intro.duk
|
||||||
'' + concatMapStrings makeSpin (range 0 24));
|
'' + lib.concatMapStrings makeSpin (lib.range 0 24));
|
||||||
|
|
||||||
helper = with haskellPackages; mkDerivation {
|
helper = with haskellPackages; mkDerivation {
|
||||||
pname = "uqm3donix";
|
pname = "uqm3donix";
|
||||||
|
@ -12,7 +12,7 @@ assert use3DOVideos -> requireFile != null && writeText != null
|
|||||||
|
|
||||||
let
|
let
|
||||||
videos = import ./3dovideo.nix {
|
videos = import ./3dovideo.nix {
|
||||||
inherit stdenv requireFile writeText fetchurl haskellPackages;
|
inherit stdenv lib requireFile writeText fetchurl haskellPackages;
|
||||||
};
|
};
|
||||||
|
|
||||||
remixPacks = lib.imap1 (num: sha256: fetchurl rec {
|
remixPacks = lib.imap1 (num: sha256: fetchurl rec {
|
||||||
|
Loading…
Reference in New Issue
Block a user