From 2cf14077f46cd52d4d98ab191af4de27c7e47a23 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:37 +0000 Subject: [PATCH] residualvm: move defaults to package file --- pkgs/games/residualvm/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index d0f1d500eaf..f6969af30c2 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib -, openglSupport ? false, libGLU_combined ? null +, libGLSupported +, openglSupport ? libGLSupported, libGLU_combined ? null }: assert openglSupport -> libGLU_combined != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 736d5cdd900..9f1686ffe64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20851,9 +20851,7 @@ in racer = callPackage ../games/racer { }; - residualvm = callPackage ../games/residualvm { - openglSupport = libGLSupported; - }; + residualvm = callPackage ../games/residualvm { }; rftg = callPackage ../games/rftg { };