diff options
| author | aszlig <aszlig@nix.build> | 2021-01-24 15:35:12 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2021-01-24 15:35:33 +0100 |
| commit | 2f30e32121691fa924dc13e6f09f569911723402 (patch) | |
| tree | 9a892f18d9fe230db3b64c75a220f09dc84ba373 /pkgs/games/uqm | |
| parent | 9e9e240a275f0a4753c8a591b9225fe77db5f114 (diff) | |
| download | nixpkgs-2f30e32121691fa924dc13e6f09f569911723402.tar nixpkgs-2f30e32121691fa924dc13e6f09f569911723402.tar.gz nixpkgs-2f30e32121691fa924dc13e6f09f569911723402.tar.bz2 nixpkgs-2f30e32121691fa924dc13e6f09f569911723402.tar.lz nixpkgs-2f30e32121691fa924dc13e6f09f569911723402.tar.xz nixpkgs-2f30e32121691fa924dc13e6f09f569911723402.tar.zst nixpkgs-2f30e32121691fa924dc13e6f09f569911723402.zip | |
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>
Diffstat (limited to 'pkgs/games/uqm')
| -rw-r--r-- | pkgs/games/uqm/3dovideo.nix | 8 | ||||
| -rw-r--r-- | pkgs/games/uqm/default.nix | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix index 0773b651152..4ebbc9c4992 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 f1ac122ccc4..a06c1b3b665 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 { |