diff options
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/acpilight/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/emulators/dolphin-emu/default.nix | 33 | ||||
-rw-r--r-- | pkgs/misc/emulators/dolphin-emu/master.nix | 44 | ||||
-rw-r--r-- | pkgs/misc/scream-receivers/default.nix | 56 | ||||
-rw-r--r-- | pkgs/misc/themes/kde2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/themes/qtcurve/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/tw-rs/default.nix | 26 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/generated.nix | 11 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/vim-plugin-names | 1 |
10 files changed, 118 insertions, 67 deletions
diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix index 4076a8c3a3af9..1975e2d379077 100644 --- a/pkgs/misc/acpilight/default.nix +++ b/pkgs/misc/acpilight/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/wavexx/acpilight"; description = "ACPI backlight control"; license = licenses.gpl3; - maintainers = with maintainers; [ "smakarov" ]; + maintainers = with maintainers; [ smakarov ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index fe8e82d98be70..813730d435d03 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib, libGLU_combined -, gettext, libpthreadstubs, libXrandr, libXext, readline, openal -, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev +{ stdenv, lib, fetchpatch, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib +, libGLU_combined , gettext, libpthreadstubs, libXrandr, libXext, readline +, openal , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev , wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml , libpulseaudio ? null }: @@ -15,17 +15,26 @@ stdenv.mkDerivation rec { sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6"; }; + patches = [ + # Fix build with soundtouch 2.1.2 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/dolphin-emu/raw/a1b91fdf94981e12c8889a02cba0ec2267d0f303/f/dolphin-emu-5.0-soundtouch-exception-fix.patch"; + name = "dolphin-emu-5.0-soundtouch-exception-fix.patch"; + sha256 = "0yd3l46nja5qiknnl30ryad98f3v8911jwnr67hn61dzx2kwbbaw"; + }) + ]; + postPatch = '' substituteInPlace Source/Core/VideoBackends/OGL/RasterFont.cpp \ --replace " CHAR_WIDTH " " CHARWIDTH " ''; - cmakeFlags = '' - -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include - -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include - -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 - -DENABLE_LTO=True - ''; + cmakeFlags = [ + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" + "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" + "-DENABLE_LTO=True" + ]; enableParallelBuilding = true; @@ -36,11 +45,11 @@ stdenv.mkDerivation rec { libevdev libXdmcp portaudio libusb libpulseaudio wxGTK30 soundtouch miniupnpc mbedtls curl lzo sfml ]; - meta = { + meta = with lib; { homepage = https://dolphin-emu.org/; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ MP2E ashkitten ]; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. platforms = [ "x86_64-linux" ]; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index fe16598fa9c00..e96b2e07890e8 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5 -, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext, libXrandr, libusb, lzo -, libpthreadstubs, libXext, libXxf86vm, libXinerama, libSM, libXdmcp, readline -, openal, udev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, mbedtls -, soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake +, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext +, libXrandr, libusb, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama +, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib +, miniupnpc, enet, mbedtls, soundtouch, sfml +, vulkan-loader ? null, libpulseaudio ? null # - Inputs used for Darwin , CoreBluetooth, ForceFeedback, IOKit, OpenGL, libpng, hidapi }: @@ -20,27 +21,27 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-10751"; + version = "5.0-10879"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "64c0ff576c6d3ea2ee35e6b6d7ea8c814442d53f"; - sha256 = "19351j3gys9kgxpdjv1dckaiv74dylcdh1kx0z9qz8llv9s1r0s3"; + rev = "c7fc9126aaf447a014af4aed195b17aa593dd49b"; + sha256 = "1pf4mxacxhrkvvh9j49ackm8hahl8x0ligmann1pafsb4lw0xbnj"; }; enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ] - ++ stdenv.lib.optionals stdenv.isLinux [ makeWrapper ]; + ++ lib.optional stdenv.isLinux wrapQtAppsHook; buildInputs = [ curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml - qt5.qtbase - ] ++ stdenv.lib.optionals stdenv.isLinux [ + qtbase + ] ++ lib.optionals stdenv.isLinux [ bluez udev libevdev alsaLib vulkan-loader - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ CoreBluetooth OpenGL ForceFeedback IOKit ]; @@ -50,14 +51,18 @@ in stdenv.mkDerivation rec { "-DDOLPHIN_WC_REVISION=${src.rev}" "-DDOLPHIN_WC_DESCRIBE=${version}" "-DDOLPHIN_WC_BRANCH=master" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ]; + qtWrapperArgs = lib.optionals stdenv.isLinux [ + "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" + ]; + # - Allow Dolphin to use nix-provided libraries instead of building them - preConfigure = '' + postPatch = '' sed -i -e 's,DISTRIBUTOR "None",DISTRIBUTOR "NixOS",g' CMakeLists.txt - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' \ CMakeLists.txt @@ -66,18 +71,13 @@ in stdenv.mkDerivation rec { postInstall = '' cp -r ${desktopItem}/share/applications $out/share ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-master - '' + stdenv.lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/dolphin-emu-nogui \ - --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - wrapProgram $out/bin/dolphin-emu \ - --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ MP2E ]; + maintainers = with maintainers; [ MP2E ashkitten ]; branch = "master"; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. diff --git a/pkgs/misc/scream-receivers/default.nix b/pkgs/misc/scream-receivers/default.nix new file mode 100644 index 0000000000000..aa88bd8a96c88 --- /dev/null +++ b/pkgs/misc/scream-receivers/default.nix @@ -0,0 +1,56 @@ +{ stdenv, lib, fetchFromGitHub, alsaLib +, pulseSupport ? false, libpulseaudio ? null +}: + +stdenv.mkDerivation rec { + pname = "scream-receivers"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "duncanthrax"; + repo = "scream"; + rev = "${version}"; + sha256 = "1iqhs7m0fv3vfld7h288j5j0jc5xdihaghd0jd9qrk68mj2g6g9w"; + }; + + buildInputs = [ alsaLib ] ++ lib.optional pulseSupport libpulseaudio; + + buildPhase = '' + (cd Receivers/alsa && make) + (cd Receivers/alsa-ivshmem && make) + '' + lib.optionalString pulseSupport '' + (cd Receivers/pulseaudio && make) + (cd Receivers/pulseaudio-ivshmem && make) + ''; + + installPhase = '' + mkdir -p $out/bin + mv ./Receivers/alsa/scream-alsa $out/bin/ + mv ./Receivers/alsa-ivshmem/scream-ivshmem-alsa $out/bin/ + '' + lib.optionalString pulseSupport '' + mv ./Receivers/pulseaudio/scream-pulse $out/bin/ + mv ./Receivers/pulseaudio-ivshmem/scream-ivshmem-pulse $out/bin/ + ''; + + doInstallCheck = true; + installCheckPhase = '' + export PATH=$PATH:$out/bin + set -o verbose + set +o pipefail + + # Programs exit with code 1 when testing help, so grep for a string + scream-alsa -h 2>&1 | grep -q Usage: + scream-ivshmem-alsa 2>&1 | grep -q Usage: + '' + lib.optionalString pulseSupport '' + scream-pulse -h 2>&1 | grep -q Usage: + scream-ivshmem-pulse 2>&1 | grep -q Usage: + ''; + + meta = with lib; { + description = "Audio receivers for the Scream virtual network sound card"; + homepage = "https://github.com/duncanthrax/scream"; + license = licenses.mspl; + platforms = platforms.linux; + maintainers = [ maintainers.ivan ]; + }; +} diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix index 7f3aa11c3f0cf..fac8c38eecaee 100644 --- a/pkgs/misc/themes/kde2/default.nix +++ b/pkgs/misc/themes/kde2/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, mkDerivation , cmake, extra-cmake-modules , qtbase, kcoreaddons, kdecoration }: let version = "2017-03-15"; -in stdenv.mkDerivation rec { +in mkDerivation rec { pname = "kde2-decoration"; inherit version; diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix index 0d4655186ebf3..0071e386e88c2 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig +{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, mkDerivation , gtk2, qtbase, qtsvg, qtx11extras # Toolkit dependencies , karchive, kconfig, kconfigwidgets, kio, frameworkintegration , kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes @@ -7,7 +7,7 @@ let version = "1.9"; -in stdenv.mkDerivation { +in mkDerivation { pname = "qtcurve"; inherit version; src = fetchurl { diff --git a/pkgs/misc/tw-rs/default.nix b/pkgs/misc/tw-rs/default.nix deleted file mode 100644 index 50fa1a9ef0ee5..0000000000000 --- a/pkgs/misc/tw-rs/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform, perl, zlib, openssl, curl }: - -rustPlatform.buildRustPackage rec { - name = "tw-rs-${version}"; - version = "0.1.26"; - - src = fetchFromGitHub { - owner = "vmchale"; - repo = "tw-rs"; - rev = "${version}"; - sha256 = "1s1gk2wcs3792gdzrngksczz3gma5kv02ni2jqrhib8l6z8mg9ia"; - }; - - buildInputs = [ perl zlib openssl ] - ++ stdenv.lib.optional stdenv.isDarwin curl; - - cargoSha256 = "00v0b2vjal1dar4kwqk246k44mjyi1zp18hyj15dsww2972bm3b7"; - - meta = with stdenv.lib; { - description = "Twitter command-line interface written in rust"; - homepage = https://github.com/vmchale/tw-rs; - license = licenses.bsd3; - maintainers = with maintainers; [ vmchale ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b8e9dd2d9609a..4dcfbeecb76df 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2113,6 +2113,17 @@ let }; }; + readline-vim = buildVimPluginFrom2Nix { + pname = "readline-vim"; + version = "2019-06-10"; + src = fetchFromGitHub { + owner = "ryvnf"; + repo = "readline.vim"; + rev = "a7c754acaf0aec922d4a6bde908a636578ef82cc"; + sha256 = "16fawg7fnlipn1f41cn1qc83dhr63qhr1bwn3qmr8sy7rbk5lihr"; + }; + }; + riv-vim = buildVimPluginFrom2Nix { pname = "riv-vim"; version = "2019-02-18"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 0c0a883f80a07..d5a1ed67665bf 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -125,12 +125,12 @@ self: super: { # Only official releases contains the required index.js file coc-nvim = buildVimPluginFrom2Nix rec { pname = "coc-nvim"; - version = "0.0.73"; + version = "0.0.74"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; rev = "v${version}"; - sha256 = "1z7573rbh806nmkh75hr1kbhxr4jysv6k9x01fcyjfwricpa3cf7"; + sha256 = "1s4nib2mnhagd0ymx254vf7l1iijwrh2xdqn3bdm4f1jnip81r10"; }; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 59b450820c186..681f91f664869 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -323,6 +323,7 @@ roxma/nvim-yarp rust-lang/rust.vim ryanoasis/vim-devicons Rykka/riv.vim +ryvnf/readline.vim samoshkin/vim-mergetool sbdchd/neoformat scrooloose/nerdcommenter |