diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix index 0773b651152e..4ebbc9c49923 100644 --- a/pkgs/games/uqm/3dovideo.nix +++ b/pkgs/games/uqm/3dovideo.nix @@ -1,10 +1,8 @@ -{ stdenv, requireFile, writeText, fetchurl, haskellPackages }: - -with lib; +{ stdenv, lib, requireFile, writeText, fetchurl, haskellPackages }: 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:" + "addons/3dovideo/spins/ship${padded}.duk:" + "addons/3dovideo/spins/spin.aif:" + @@ -13,7 +11,7 @@ let videoRMP = writeText "3dovideo.rmp" ('' slides.ending = 3DOVID:addons/3dovideo/ending/victory.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 { pname = "uqm3donix"; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index f1ac122ccc41..a06c1b3b6652 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -12,7 +12,7 @@ assert use3DOVideos -> requireFile != null && writeText != null let videos = import ./3dovideo.nix { - inherit stdenv requireFile writeText fetchurl haskellPackages; + inherit stdenv lib requireFile writeText fetchurl haskellPackages; }; remixPacks = lib.imap1 (num: sha256: fetchurl rec {