uqm: Fix evaluation of 3DO video package

Regression introduced by 2e34288f0d8cf01eea228c7dbc50af9589b885f3.

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>

aszlig 2f30e321 9e9e240a

+4 -6
+3 -5
pkgs/games/uqm/3dovideo.nix
··· 1 - { stdenv, requireFile, writeText, fetchurl, haskellPackages }: 2 - 3 - with lib; 1 + { stdenv, lib, requireFile, writeText, fetchurl, haskellPackages }: 4 2 5 3 let 6 4 makeSpin = num: let 7 - padded = (optionalString (lessThan num 10) "0") + toString num; 5 + padded = (lib.optionalString (lib.lessThan num 10) "0") + toString num; 8 6 in "slides.spins.${padded} = 3DOVID:" + 9 7 "addons/3dovideo/spins/ship${padded}.duk:" + 10 8 "addons/3dovideo/spins/spin.aif:" + ··· 13 11 videoRMP = writeText "3dovideo.rmp" ('' 14 12 slides.ending = 3DOVID:addons/3dovideo/ending/victory.duk 15 13 slides.intro = 3DOVID:addons/3dovideo/intro/intro.duk 16 - '' + concatMapStrings makeSpin (range 0 24)); 14 + '' + lib.concatMapStrings makeSpin (lib.range 0 24)); 17 15 18 16 helper = with haskellPackages; mkDerivation { 19 17 pname = "uqm3donix";
+1 -1
pkgs/games/uqm/default.nix
··· 12 12 13 13 let 14 14 videos = import ./3dovideo.nix { 15 - inherit stdenv requireFile writeText fetchurl haskellPackages; 15 + inherit stdenv lib requireFile writeText fetchurl haskellPackages; 16 16 }; 17 17 18 18 remixPacks = lib.imap1 (num: sha256: fetchurl rec {