From 4a7f99d55d299453a9c2397f90b33d1120669775 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 11 Jan 2021 08:54:33 +0100 Subject: treewide: with stdenv.lib; in meta -> with lib; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Part of: https://github.com/NixOS/nixpkgs/issues/108938 meta = with stdenv.lib; is a widely used pattern. We want to slowly remove the `stdenv.lib` indirection and encourage people to use `lib` directly. Thus let’s start with the meta field. This used a rewriting script to mostly automatically replace all occurances of this pattern, and add the `lib` argument to the package header if it doesn’t exist yet. The script in its current form is available at https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix --- pkgs/misc/emulators/atari++/default.nix | 4 ++-- pkgs/misc/emulators/attract-mode/default.nix | 4 ++-- pkgs/misc/emulators/caprice32/default.nix | 4 ++-- pkgs/misc/emulators/ccemux/default.nix | 4 ++-- pkgs/misc/emulators/cdemu/base.nix | 4 ++-- pkgs/misc/emulators/cdemu/vhba.nix | 4 ++-- pkgs/misc/emulators/citra/default.nix | 2 +- pkgs/misc/emulators/craftos-pc/default.nix | 4 ++-- pkgs/misc/emulators/dgen-sdl/default.nix | 4 ++-- pkgs/misc/emulators/emu2/default.nix | 4 ++-- pkgs/misc/emulators/gens-gs/default.nix | 4 ++-- pkgs/misc/emulators/gxemul/default.nix | 4 ++-- pkgs/misc/emulators/higan/default.nix | 4 ++-- pkgs/misc/emulators/kega-fusion/default.nix | 2 +- pkgs/misc/emulators/lambda-delta/default.nix | 4 ++-- pkgs/misc/emulators/libdsk/default.nix | 4 ++-- pkgs/misc/emulators/mednafen/default.nix | 4 ++-- pkgs/misc/emulators/mednafen/server.nix | 4 ++-- pkgs/misc/emulators/melonDS/default.nix | 4 ++-- pkgs/misc/emulators/mgba/default.nix | 4 ++-- pkgs/misc/emulators/mupen64plus/default.nix | 4 ++-- pkgs/misc/emulators/pcsx2/default.nix | 4 ++-- pkgs/misc/emulators/pcsxr/default.nix | 4 ++-- pkgs/misc/emulators/qmc2/default.nix | 4 ++-- pkgs/misc/emulators/reicast/default.nix | 4 ++-- pkgs/misc/emulators/retroarch/cores.nix | 4 ++-- pkgs/misc/emulators/retrofe/default.nix | 4 ++-- pkgs/misc/emulators/ruffle/default.nix | 4 ++-- pkgs/misc/emulators/ryujinx/default.nix | 4 ++-- pkgs/misc/emulators/sameboy/default.nix | 4 ++-- pkgs/misc/emulators/simh/default.nix | 4 ++-- pkgs/misc/emulators/simplenes/default.nix | 4 ++-- pkgs/misc/emulators/snes9x-gtk/default.nix | 4 ++-- pkgs/misc/emulators/tilem/default.nix | 2 +- pkgs/misc/emulators/wine/vkd3d.nix | 4 ++-- pkgs/misc/emulators/yabause/default.nix | 4 ++-- pkgs/misc/emulators/yuzu/default.nix | 4 ++-- 37 files changed, 71 insertions(+), 71 deletions(-) (limited to 'pkgs/misc/emulators') diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index 9d7a477be61d..4758d173e92d 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }: +{ lib, stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }: stdenv.mkDerivation rec { pname = "atari++"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} "$out/bin/atari++" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.xl-project.com/"; description = "An enhanced, cycle-accurated Atari emulator"; longDescription = '' diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index ac87190b0507..1550f71fb40a 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -1,5 +1,5 @@ { expat, fetchFromGitHub, ffmpeg_3, fontconfig, freetype, libarchive, libjpeg -, libGLU, libGL, openal, pkgconfig, sfml, stdenv, zlib +, libGLU, libGL, openal, pkgconfig, sfml, lib, stdenv, zlib }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { expat ffmpeg_3 fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A frontend for arcade cabinets and media PCs"; homepage = "http://attractmode.org"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix index 4b2b6208bb40..69002d00f80a 100644 --- a/pkgs/misc/emulators/caprice32/default.nix +++ b/pkgs/misc/emulators/caprice32/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, desktop-file-utils, libpng +{ lib, stdenv, fetchFromGitHub, desktop-file-utils, libpng , pkgconfig, SDL, freetype, zlib }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { install -Dm644 $out/share/caprice32/resources/freedesktop/caprice32.menu -t $out/etc/xdg/menus/applications-merged/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A complete emulation of CPC464, CPC664 and CPC6128"; homepage = "https://github.com/ColinPitrat/caprice32"; license = licenses.gpl2; diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index 2313a63dc698..96cb9afaf2f8 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, jre +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, jre , useCCTweaked ? true }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A modular ComputerCraft emulator"; homepage = "https://github.com/CCEmuX/CCEmuX"; license = licenses.mit; diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index f493faaac54f..51e6a6ac5c8f 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -1,5 +1,5 @@ { pkgName, version, pkgSha256 }: -{ stdenv, fetchurl, cmake, pkgconfig, buildInputs, drvParams ? {} }: +{ lib, stdenv, fetchurl, cmake, pkgconfig, buildInputs, drvParams ? {} }: let name = "${pkgName}-${version}"; in stdenv.mkDerivation ({ inherit name buildInputs; @@ -16,7 +16,7 @@ in stdenv.mkDerivation ({ configurePhase = '' cmake ../${name} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A suite of tools for emulating optical drives and discs"; longDescription = '' CDEmu consists of: diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 9723e53a8fdb..17d2f8f5e97a 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchurl, kernel }: stdenv.mkDerivation rec { pname = "vhba"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides a Virtual (SCSI) HBA"; homepage = "http://cdemu.sourceforge.net/about/vhba/"; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index dbfc96c22981..b4afb6bbf975 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -21,7 +21,7 @@ mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://citra-emu.org"; description = "An open-source emulator for the Nintendo 3DS"; license = licenses.gpl2; diff --git a/pkgs/misc/emulators/craftos-pc/default.nix b/pkgs/misc/emulators/craftos-pc/default.nix index 42fb33051e61..3bc9e0b81cc0 100644 --- a/pkgs/misc/emulators/craftos-pc/default.nix +++ b/pkgs/misc/emulators/craftos-pc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, poco, openssl, SDL2, SDL2_mixer }: +{ lib, stdenv, fetchFromGitHub, poco, openssl, SDL2, SDL2_mixer }: let craftos2-lua = fetchFromGitHub { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { DESTDIR=$out/bin make install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of the CraftOS-PC API written in C++ using SDL"; homepage = "https://www.craftos-pc.cc"; license = licenses.mit; diff --git a/pkgs/misc/emulators/dgen-sdl/default.nix b/pkgs/misc/emulators/dgen-sdl/default.nix index 1eabf5b53b01..4a76ee0df026 100644 --- a/pkgs/misc/emulators/dgen-sdl/default.nix +++ b/pkgs/misc/emulators/dgen-sdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , libarchive , doxygen @@ -33,7 +33,7 @@ in stdenv.mkDerivation { "--with-dz80" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://dgen.sourceforge.net/"; description = "Sega Genesis/Mega Drive emulator"; longDescription = '' diff --git a/pkgs/misc/emulators/emu2/default.nix b/pkgs/misc/emulators/emu2/default.nix index fb13b602b6a6..eef361ecd037 100644 --- a/pkgs/misc/emulators/emu2/default.nix +++ b/pkgs/misc/emulators/emu2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "emu2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dmsc/emu2/"; description = "A simple text-mode x86 + DOS emulator"; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index a9449808d527..563ea5f46f89 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU, libGL }: +{ lib, stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU, libGL }: stdenv.mkDerivation { name = "gens-gs-7"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { # See http://ubuntuforums.org/showthread.php?p=10535837 NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://segaretro.org/Gens/GS"; description = "A Genesis/Mega Drive emulator"; platforms = [ "i686-linux" ]; diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix index 8671056d14eb..3149ccaaaac0 100644 --- a/pkgs/misc/emulators/gxemul/default.nix +++ b/pkgs/misc/emulators/gxemul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "gxemul"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -r ./man $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gavare.se/gxemul/"; description = "Gavare's experimental emulator"; longDescription = '' diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index e735bdb38eed..88872dd3972b 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkgconfig , libX11, libXv , udev @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/higan-init.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An open-source, cycle-accurate multi-system emulator"; longDescription = '' higan is a multi-system game console emulator. The purpose of higan is to diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix index 0b6fb0dea54d..1b00a55fe058 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/misc/emulators/kega-fusion/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation { chmod +x "$out/bin/kega-fusion" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Sega SG1000, SC3000, SF7000, Master System, Game Gear, Genesis/Megadrive, SVP, Pico, SegaCD/MegaCD and 32X emulator"; homepage = "https://www.carpeludum.com/kega-fusion/"; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/misc/emulators/lambda-delta/default.nix b/pkgs/misc/emulators/lambda-delta/default.nix index 0668d2db9086..a17a0eadfd5b 100644 --- a/pkgs/misc/emulators/lambda-delta/default.nix +++ b/pkgs/misc/emulators/lambda-delta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, SDL2 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, SDL2 }: stdenv.mkDerivation rec { pname = "lambda-delta"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-SDL1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "LMI (Lambda Lisp Machine) emulator"; homepage = "https://github.com/dseagrav/ld"; license = licenses.gpl2; diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix index 219875ba6fcb..c0e54e48db32 100644 --- a/pkgs/misc/emulators/libdsk/default.nix +++ b/pkgs/misc/emulators/libdsk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libdsk"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0s2k9vkrf95pf4ydc6vazb29ysrnhdpcfjnf17lpk4nmlv1j3vyv"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for accessing discs and disc image files"; homepage = "http://www.seasip.info/Unix/LibDsk/"; license = licenses.gpl2Plus; diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index cb4b7997383f..693ada8d3c7f 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2 +{ lib, stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2 , libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsaLib }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { mv Documentation $out/share/doc/mednafen ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; longDescription = '' Mednafen is a portable, utilizing OpenGL and SDL, diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix index 9a1edc00452d..065426255549 100644 --- a/pkgs/misc/emulators/mednafen/server.nix +++ b/pkgs/misc/emulators/mednafen/server.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mednafen-server"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { postInstall = "install -m 644 -Dt $out/share/mednafen-server standard.conf"; - meta = with stdenv.lib; { + meta = with lib; { description = "Netplay server for Mednafen"; homepage = "https://mednafen.github.io/"; license = licenses.gpl2; diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix index 7e0e9647db28..98754de8d4f0 100644 --- a/pkgs/misc/emulators/melonDS/default.nix +++ b/pkgs/misc/emulators/melonDS/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , mkDerivation , cmake @@ -31,7 +31,7 @@ mkDerivation rec { cmakeFlags = [ "-UUNIX_PORTABLE" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://melonds.kuribo64.net/"; description = "Work in progress Nintendo DS emulator"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index ddbe276de3c4..a6f59122b64d 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkgconfig , cmake, epoxy, libzip, libelf, libedit, ffmpeg_3, SDL2, imagemagick , qtbase, qtmultimedia, qttools, minizip }: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { cp -r ${desktopItem}/share/applications $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mgba.io"; description = "A modern GBA emulator with a focus on accuracy"; diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index 621559627a75..49681aaee942 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib, nasm }: +{lib, stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib, nasm }: stdenv.mkDerivation rec { pname = "mupen64plus"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { dash m64p_install.sh DESTDIR="$out" PREFIX="" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Nintendo 64 Emulator"; license = licenses.gpl2Plus; homepage = "http://www.mupen64plus.org/"; diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 5bbf70004abe..a71ccb46b998 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -19,7 +19,7 @@ , portaudio , SDL2 , soundtouch -, stdenv +, lib, stdenv , udev , wrapGAppsHook , wxGTK @@ -91,7 +91,7 @@ stdenv.mkDerivation { zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Playstation 2 emulator"; longDescription= '' PCSX2 is an open-source PlayStation 2 (AKA PS2) emulator. Its purpose diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix index ae608f563128..47a87dcca0b5 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, intltool, pkgconfig, gtk3, SDL2, xorg +{ lib, stdenv, fetchurl, autoreconfHook, intltool, pkgconfig, gtk3, SDL2, xorg , wrapGAppsHook, libcdio, nasm, ffmpeg, file , fetchpatch }: @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { "$out/share/doc/${pname}-${version}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Playstation 1 emulator"; homepage = "https://pcsxr.codeplex.com/"; maintainers = with maintainers; [ rardiol ]; diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix index 5a813c5d2efe..b38692de2633 100644 --- a/pkgs/misc/emulators/qmc2/default.nix +++ b/pkgs/misc/emulators/qmc2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl, qttools, pkgconfig , minizip, zlib , qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "DATADIR=/share/" "SYSCONFDIR=/etc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Qt frontend for MAME/MESS"; homepage = "https://qmc2.batcom-it.net"; license = licenses.gpl2; diff --git a/pkgs/misc/emulators/reicast/default.nix b/pkgs/misc/emulators/reicast/default.nix index c9dff7217d2f..8c0bc30d4384 100644 --- a/pkgs/misc/emulators/reicast/default.nix +++ b/pkgs/misc/emulators/reicast/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://reicast.com/"; description = "A multi-platform Sega Dreamcast emulator"; license = with licenses; [ bsd3 gpl2Only lgpl2Only ]; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index c210b3ddeece..657715778960 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkgconfig, makeWrapper, python27, python37, retroarch +{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkgconfig, makeWrapper, python27, python37, retroarch , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL , ffmpeg_3, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl @@ -46,7 +46,7 @@ let libretroCore = "/lib/retroarch/cores"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit (a) description license; broken = a.broken or false; homepage = "https://www.libretro.com/"; diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index d2c904723b1e..f69505b65f12 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkgconfig +{ lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkgconfig , python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell }: @@ -68,7 +68,7 @@ stdenv.mkDerivation { --run 'export RETROFE_PATH=''${RETROFE_PATH:-$PWD}' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A frontend for arcade cabinets and media PCs"; homepage = "http://retrofe.com"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix index f3518a647fa1..b817716075cc 100644 --- a/pkgs/misc/emulators/ruffle/default.nix +++ b/pkgs/misc/emulators/ruffle/default.nix @@ -4,7 +4,7 @@ , pkg-config , python3 , rustPlatform -, stdenv +, lib, stdenv , wayland , xorg }: @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "05kwfcbzjyyfhiqklhhlv06pinzw9bry4j8l9lk3k04c1q30gzkw"; - meta = with stdenv.lib; { + meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; homepage = "https://ruffle.rs/"; license = with licenses; [ mit asl20 ]; diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index 0e6784e69eab..b7259a3deb32 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs +{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs , dotnet-sdk_3, dotnetPackages, dotnetCorePackages , SDL2, libX11, openal , gtk3, gobject-introspection, wrapGAppsHook @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { # Strip breaks the executable. dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Experimental Nintendo Switch Emulator written in C#"; homepage = "https://ryujinx.org/"; license = licenses.mit; diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/misc/emulators/sameboy/default.nix index e90cc5a00f50..d23129eba7e5 100644 --- a/pkgs/misc/emulators/sameboy/default.nix +++ b/pkgs/misc/emulators/sameboy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }: +{ lib, stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }: stdenv.mkDerivation rec { pname = "sameboy"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sameboy.github.io"; description = "Game Boy, Game Boy Color, and Super Game Boy emulator"; diff --git a/pkgs/misc/emulators/simh/default.nix b/pkgs/misc/emulators/simh/default.nix index 50e02a8f2403..08068debeefc 100644 --- a/pkgs/misc/emulators/simh/default.nix +++ b/pkgs/misc/emulators/simh/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , SDL2 , SDL2_ttf @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { (cd $out/bin; for i in *; do ln -s $i simh-$i; done) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://simh.trailing-edge.com/"; description = "A collection of simulators of historic hardware"; longDescription = '' diff --git a/pkgs/misc/emulators/simplenes/default.nix b/pkgs/misc/emulators/simplenes/default.nix index d4805a62d761..d073098507ee 100644 --- a/pkgs/misc/emulators/simplenes/default.nix +++ b/pkgs/misc/emulators/simplenes/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , sfml @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp ./SimpleNES $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/amhndu/SimpleNES"; description = "An NES emulator written in C++"; license = licenses.gpl3; diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index f33af245f710..254c4a329e54 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wrapGAppsHook , SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preConfigure = "cd gtk"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.snes9x.com"; description = "Super Nintendo Entertainment System (SNES) emulator"; diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix index 8a6c5075c9b3..4c51759e71e8 100644 --- a/pkgs/misc/emulators/tilem/default.nix +++ b/pkgs/misc/emulators/tilem/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib gnome2.gtk libticonv libtifiles2 libticables2 libticalcs2 ]; NIX_CFLAGS_COMPILE = [ "-lm" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://lpg.ticalc.org/prj_tilem/"; description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/emulators/wine/vkd3d.nix b/pkgs/misc/emulators/wine/vkd3d.nix index 91bef28559d5..303d33df217d 100644 --- a/pkgs/misc/emulators/wine/vkd3d.nix +++ b/pkgs/misc/emulators/wine/vkd3d.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, vulkan-headers, spirv-headers, vulkan-loader }: +{ lib, stdenv, fetchurl, vulkan-headers, spirv-headers, vulkan-loader }: #TODO: MoltenVK #TODO: unstable @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A 3d library build on top on Vulkan with a similar api to DirectX 12"; homepage = "https://source.winehq.org/git/vkd3d.git"; license = licenses.lgpl21; diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index 584a7b47dc70..80ddc32ac6cf 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL +{ mkDerivation, lib, stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL , freeglut ? null, openal ? null, SDL2 ? null }: mkDerivation rec { @@ -26,7 +26,7 @@ mkDerivation rec { "-DYAB_PORTS=qt" ] ; - meta = with stdenv.lib; { + meta = with lib; { description = "An open-source Sega Saturn emulator"; homepage = "https://yabause.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/misc/emulators/yuzu/default.nix index 3c643822c16e..ae151f96ed36 100644 --- a/pkgs/misc/emulators/yuzu/default.nix +++ b/pkgs/misc/emulators/yuzu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, pkgconfig, wrapQtAppsHook , boost173, catch2, fmt, lz4, nlohmann_json, rapidjson, zlib, zstd, SDL2 , udev, libusb1, libzip, qtbase, qtwebengine, qttools, ffmpeg @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://yuzu-emu.org"; description = "An experimental Nintendo Switch emulator written in C++"; license = with licenses; [ -- cgit v1.2.3