summaryrefslogtreecommitdiffstats
path: root/pkgs/misc
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/emulators/dolphin-emu/default.nix33
-rw-r--r--pkgs/misc/emulators/dolphin-emu/master.nix44
-rw-r--r--pkgs/misc/scrcpy/default.nix15
-rw-r--r--pkgs/misc/scream-receivers/default.nix56
-rw-r--r--pkgs/misc/themes/obsidian2/default.nix32
-rw-r--r--pkgs/misc/tw-rs/default.nix26
-rw-r--r--pkgs/misc/vscode-extensions/cpptools/default.nix4
7 files changed, 112 insertions, 98 deletions
diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index 392f5618b6e5..a14f18da4669 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 4f48f1248f49..ab8ec6868cf2 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 {
name = "dolphin-emu-${version}";
- 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/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix
index 20ba1295c422..bfca574cd497 100644
--- a/pkgs/misc/scrcpy/default.nix
+++ b/pkgs/misc/scrcpy/default.nix
@@ -2,6 +2,7 @@
, meson
, ninja
, pkgconfig
+, fetchpatch
, platform-tools
, ffmpeg
@@ -9,10 +10,10 @@
}:
let
- version = "1.8";
+ version = "1.10";
prebuilt_server = fetchurl {
url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar";
- sha256 = "1h755k5xpchlm7wq2yk5mlwjnh7y4yhviffixacby0srj3pmb443";
+ sha256 = "144k25x6ha89l9p5a1dm6r3fqvgqszzwrhvkvk0r44vg0i71msyb";
};
in
stdenv.mkDerivation rec {
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "Genymobile";
repo = pname;
rev = "v${version}";
- sha256 = "1cx7y3w699s3i8s53l1mb7lkrnbix457hf17liwh00jzb0i7aga7";
+ sha256 = "0hhncqcs49n9g8sgvwbyvkaq4b1dhrpn7qgnaj6grjcb0i27vzaq";
};
# postPatch:
@@ -39,12 +40,18 @@ stdenv.mkDerivation rec {
buildInputs = [ ffmpeg SDL2 ];
+ # FIXME: remove on update to > 1.10
+ patches = [(fetchpatch {
+ url = "https://github.com/Genymobile/scrcpy/commit/c05056343b56be65ae887f8b7ead61a8072622b9.diff";
+ sha256 = "1xh24gr2g2i9rk0zyv19jx54hswrq12ssp227vxbhsbamin9ir5b";
+ })];
+
# Manually install the server jar to prevent Meson from "fixing" it
preConfigure = ''
echo -n > server/meson.build
'';
- mesonFlags = ["-Doverride_server_path=${prebuilt_server}"];
+ mesonFlags = [ "-Doverride_server_path=${prebuilt_server}" ];
postInstall = ''
mkdir -p "$out/share/scrcpy"
ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server.jar"
diff --git a/pkgs/misc/scream-receivers/default.nix b/pkgs/misc/scream-receivers/default.nix
new file mode 100644
index 000000000000..aa88bd8a96c8
--- /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/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix
deleted file mode 100644
index 8a8e88ff6f96..000000000000
--- a/pkgs/misc/themes/obsidian2/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
-
-stdenv.mkDerivation rec {
- name = "theme-obsidian2-${version}";
- version = "2.8";
-
- src = fetchFromGitHub {
- owner = "madmaxms";
- repo = "theme-obsidian-2";
- rev = "v${version}";
- sha256 = "0qryqpyxbhr0kyar2cshwhzv4da6rfz9gi4wjb6xvcb6szxhlcaq";
- };
-
- propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
- postPatch = ''
- sed -i -e 's|Obsidian-2-Local|Obsidian-2|' Obsidian-2/index.theme
- '';
-
- installPhase = ''
- mkdir -p $out/share/themes
- cp -a Obsidian-2 $out/share/themes
- '';
-
- meta = with stdenv.lib; {
- description = "Gnome theme, based upon Adwaita-Maia dark skin";
- homepage = https://github.com/madmaxms/theme-obsidian-2;
- license = with licenses; [ gpl3 ];
- platforms = platforms.linux;
- maintainers = [ maintainers.romildo ];
- };
-}
diff --git a/pkgs/misc/tw-rs/default.nix b/pkgs/misc/tw-rs/default.nix
deleted file mode 100644
index 50fa1a9ef0ee..000000000000
--- 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/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index a5dad88b924e..73b533f368ef 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -83,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "cpptools";
publisher = "ms-vscode";
- version = "0.24.1";
- sha256 = "0gqplcppfg2lr6k198q9pw08n0cpc0wvc9w350m9ivv35hw0x5ra";
+ version = "0.25.0";
+ sha256 = "0vqqc0j9ahhb9a8wrhjjb34rfdj7msqsza3443bi4206gkiwpp3n";
};
buildInputs = [