nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 04:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-22.05 into staging-next-22.05

Browse Source
This commit is contained in:
github-actions[bot]
2022-08-16 00:16:29 +00:00
committed by GitHub
parent f9f20ee123 50b6709b40
commit 22eb5eb461
14 changed files with 181 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
View File

@@ -33,10 +33,6 @@ let
};
patches = [ ./libdeltachat-darwin-dylib.patch ] ++ old.patches;
});
electronExec = if stdenv.isDarwin then
"${electron_16}/Applications/Electron.app/Contents/MacOS/Electron"
else
"${electron_16}/bin/electron";
esbuild' = esbuild.overrideAttrs (old: rec {
version = "0.12.29";
src = fetchFromGitHub {
@@ -95,7 +91,7 @@ in nodejs-14_x.pkgs.deltachat-desktop.override rec {
$out/lib/node_modules/deltachat-desktop/html-dist/fonts
done
makeWrapper ${electronExec} $out/bin/deltachat \
makeWrapper ${electron_16}/bin/electron $out/bin/deltachat \
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \
--add-flags $out/lib/node_modules/deltachat-desktop
'';

3
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@@ -19,7 +19,6 @@
let
pinData = lib.importJSON ./pin.json;
executableName = "element-desktop";
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
keytar = callPackage ./keytar { inherit Security AppKit; };
seshat = callPackage ./seshat { inherit CoreServices; };
in
@@ -83,7 +82,7 @@ mkYarnPackage rec {
# executable wrapper
# LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102
makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
--add-flags "$out/share/element/electron" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"

3
pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix
View File

@@ -19,7 +19,6 @@
let
pinData = lib.importJSON ./pin.json;
executableName = "schildichat-desktop";
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
in
stdenv.mkDerivation rec {
pname = "schildichat-desktop";
@@ -88,7 +87,7 @@ stdenv.mkDerivation rec {
done
# executable wrapper
makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
--add-flags "$out/share/element/electron" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"

4
pkgs/applications/networking/shellhub-agent/default.nix
View File

@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "shellhub-agent";
version = "0.9.4";
version = "0.9.5";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${version}";
sha256 = "WcxRVup7wjA9YNyL6UpFoMfkCmXixfbYatcrmA4OHh4=";
sha256 = "EBtQOli8jh5Ful39tR4U/H3KH517LmoYfqVyydQQTpA=";
};
modRoot = "./agent";

6
pkgs/applications/office/micropad/default.nix
View File

@@ -11,10 +11,6 @@
}:
let
executableName = "micropad";
electron_exec =
if stdenv.isDarwin
then "${electron}/Applications/Electron.app/Contents/MacOS/Electron"
else "${electron}/bin/electron";
in
mkYarnPackage rec {
pname = "micropad";
@@ -64,7 +60,7 @@ in
done
# executable wrapper
makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
--add-flags "$out/share/micropad" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"

4
pkgs/applications/science/misc/foldingathome/client.nix
View File

@@ -10,7 +10,7 @@
}:
let
majMin = lib.versions.majorMinor version;
version = "7.6.13";
version = "7.6.21";
fahclient = stdenv.mkDerivation rec {
inherit version;
@@ -18,7 +18,7 @@ let
src = fetchurl {
url = "https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v${majMin}/fahclient_${version}_amd64.deb";
sha256 = "1j2cnsyassvifp6ymwd9kxwqw09hks24834gf7nljfncyy9g4g0i";
sha256 = "2827f05f1c311ee6c7eca294e4ffb856c81957e8f5bfc3113a0ed27bb463b094";
};
nativeBuildInputs = [

91
pkgs/applications/window-managers/gamescope/default.nix Normal file
View File

@@ -0,0 +1,91 @@
{ stdenv
, fetchFromGitHub
, meson
, pkg-config
, ninja
, xorg
, libdrm
, vulkan-loader
, wayland
, wayland-protocols
, libxkbcommon
, libcap
, SDL2
, pipewire
, udev
, pixman
, libinput
, seatd
, xwayland
, glslang
, stb
, wlroots
, libliftoff
, lib
, makeBinaryWrapper
}:
let
pname = "gamescope";
version = "3.11.33-jupiter-3.3-2";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchFromGitHub {
owner = "Plagman";
repo = "gamescope";
rev = "refs/tags/${version}";
hash = "sha256-6/gTsQGZDQPCdmXe5EI9QcT/MkdTf6odsI2/+g/W7Qc=";
};
patches = [ ./use-pkgconfig.patch ];
nativeBuildInputs = [
meson
pkg-config
ninja
makeBinaryWrapper
];
buildInputs = [
xorg.libXdamage
xorg.libXcomposite
xorg.libXrender
xorg.libXext
xorg.libXxf86vm
xorg.libXtst
xorg.libXres
xorg.libXi
libdrm
libliftoff
vulkan-loader
glslang
SDL2
wayland
wayland-protocols
wlroots
xwayland
seatd
libinput
libxkbcommon
udev
pixman
pipewire
libcap
stb
];
# --debug-layers flag expects these in the path
postInstall = ''
wrapProgram "$out/bin/gamescope" \
--prefix PATH : ${with xorg; lib.makeBinPath [xprop xwininfo]}
'';
meta = with lib; {
description = "SteamOS session compositing window manager";
homepage = "https://github.com/Plagman/gamescope";
license = licenses.bsd2;
maintainers = with maintainers; [ nrdxp ];
platforms = platforms.linux;
};
}

11
pkgs/applications/window-managers/gamescope/use-pkgconfig.patch Normal file
View File

@@ -0,0 +1,11 @@
diff --git a/meson.build b/meson.build
index 1311784..77043ac 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,6 @@ project(
default_options: [
'cpp_std=c++14',
'warning_level=2',
- 'force_fallback_for=wlroots,libliftoff',
],
)

7
pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
View File

@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "elementary-terminal";
version = "6.0.2";
version = "6.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "terminal";
rev = version;
sha256 = "sha256-glcY47E9bGVI6k9gakItN6srzMtmA4hCEz/JVD5UUmI=";
sha256 = "sha256-qxjHrlpdJcfXEUan/JgU7HqBRdB36gxAb5xmd/ySsj0=";
};
nativeBuildInputs = [
@@ -49,9 +49,6 @@ stdenv.mkDerivation rec {
vte
];
# See https://github.com/elementary/terminal/commit/914d4b0e2d0a137f12276d748ae07072b95eff80
mesonFlags = [ "-Dubuntu-bionic-patched-vte=false" ];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py

7
pkgs/development/tools/electron/generic.nix
View File

@@ -103,14 +103,17 @@ let
};
darwin = {
nativeBuildInputs = [ unzip ];
nativeBuildInputs = [
makeWrapper
unzip
];
buildCommand = ''
mkdir -p $out/Applications
unzip $src
mv Electron.app $out/Applications
mkdir -p $out/bin
ln -s $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron
makeWrapper $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron
'';
};
in

13
pkgs/development/tools/misc/strace/default.nix
View File

@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, perl, libunwind, buildPackages }:
{ lib, stdenv, fetchurl, perl, libunwind, buildPackages, gitUpdater }:
stdenv.mkDerivation rec {
pname = "strace";
version = "5.18";
version = "5.19";
src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-YCk+p5rJJT1gDNyb4HetKYjKIihKQ5yeZr5RUNs9EYc=";
sha256 = "sha256-qj3ByOYOT2/z05ZRSqJH88e/cZ2KjcTdT6eTvnhr7KM=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -18,6 +18,13 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-mpers=check" ];
passthru.updateScript = gitUpdater {
inherit pname version;
# No nicer place to find latest release.
url = "https://github.com/strace/strace.git";
rev-prefix = "v";
};
meta = with lib; {
homepage = "https://strace.io/";
description = "A system call tracer for Linux";

6
pkgs/servers/x11/xorg/xwayland.nix
View File

@@ -42,12 +42,12 @@
, defaultFontPath ? "" }:
stdenv.mkDerivation rec {
pname = "xwayland";
version = "22.1.1";
version = "22.1.3";
src = fetchurl {
url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
sha256 = "sha256-9dDgujfhm7h8YvYdpZcL0gSTnyEgYglkvtTMhJW6plc=";
sha256 = "sha256-pxLre84yzZNN82gUtd0EaqZwiZwW/pjyr7ADV4+GocU=";
};
depsBuildBuild = [

53
pkgs/tools/graphics/mangohud/default.nix
View File

@@ -25,8 +25,12 @@
, vulkan-loader
, libXNVCtrl
, wayland
, spdlog
, glew
, glfw
, nlohmann_json
, xorg
, addOpenGLRunpath
, gamescopeSupport ? true # build mangoapp and mangohudctl
}:
let
@@ -44,6 +48,27 @@ let
sha256 = "sha256-bQC0QmkLalxdj4mDEdqvvOFtNwz2T1MpTDuMXGYeQ18=";
};
};
# Derived from subprojects/spdlog.wrap
#
# NOTE: We only statically link spdlog due to a bug in pressure-vessel:
# https://github.com/ValveSoftware/steam-runtime/issues/511
#
# Once this fix is released upstream, we should switch back to using
# the system provided spdlog
spdlog = rec {
version = "1.8.5";
src = fetchFromGitHub {
owner = "gabime";
repo = "spdlog";
rev = "refs/tags/v${version}";
sha256 = "sha256-D29jvDZQhPscaOHlrzGN1s7/mXlcsovjbqYpXd7OM50=";
};
patch = fetchurl {
url = "https://wrapdb.mesonbuild.com/v2/spdlog_${version}-1/get_patch";
sha256 = "sha256-PDjyddV5KxKGORECWUMp6YsXc3kks0T5gxKrCZKbdL4=";
};
};
in stdenv.mkDerivation rec {
pname = "mangohud";
version = "0.6.8";
@@ -62,7 +87,7 @@ in stdenv.mkDerivation rec {
postUnpack = ''(
cd "$sourceRoot/subprojects"
cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version}
unzip ${imgui.patch}
cp -R --no-preserve=mode,ownership ${spdlog.src} spdlog-${spdlog.version}
)'';
patches = [
@@ -97,11 +122,20 @@ in stdenv.mkDerivation rec {
})
];
postPatch = ''(
cd subprojects
unzip ${imgui.patch}
unzip ${spdlog.patch}
)'';
mesonFlags = [
"-Duse_system_vulkan=enabled"
"-Dvulkan_datadir=${vulkan-headers}/share"
"-Dwith_wayland=enabled"
"-Duse_system_spdlog=enabled"
] ++ lib.optionals gamescopeSupport [
"-Dmangoapp_layer=true"
"-Dmangoapp=true"
"-Dmangohudctl=true"
];
nativeBuildInputs = [
@@ -121,7 +155,12 @@ in stdenv.mkDerivation rec {
libX11
libXNVCtrl
wayland
spdlog
] ++ lib.optionals gamescopeSupport [
glew
glfw
nlohmann_json
vulkan-headers
xorg.libXrandr
];
# Support 32bit Vulkan applications by linking in 32bit Vulkan layer
@@ -137,6 +176,12 @@ in stdenv.mkDerivation rec {
wrapProgram "$out/bin/mangohud" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ addOpenGLRunpath.driverLink ]} \
--prefix XDG_DATA_DIRS : "$out/share"
'' + lib.optionalString (gamescopeSupport) ''
if [[ -e "$out/bin/mangoapp" ]]; then
wrapProgram "$out/bin/mangoapp" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ addOpenGLRunpath.driverLink ]} \
--prefix XDG_DATA_DIRS : "$out/share"
fi
'';
meta = with lib; {

2
pkgs/top-level/all-packages.nix
View File

@@ -1122,6 +1122,8 @@ with pkgs;
libgamemode32 = pkgsi686Linux.gamemode.lib;
};
gamescope = callPackage ../applications/window-managers/gamescope { };
gay = callPackage ../tools/misc/gay { };
elkhound = callPackage ../development/tools/elkhound { };