public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-09-03 18:02:46 +00:00 committed by GitHub
commit ed81bc5bd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/desktops/pipewire/pipewire.nix
View File

@ -194,7 +194,7 @@ in {
}; };
environment.sessionVariables.LD_LIBRARY_PATH = environment.sessionVariables.LD_LIBRARY_PATH =
lib.optional cfg.jack.enable "/run/current-system/sw/lib/pipewire"; lib.optional cfg.jack.enable "${cfg.package.jack}/lib";
# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/464#note_723554 # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/464#note_723554
systemd.user.services.pipewire.environment."PIPEWIRE_LINK_PASSIVE" = "1"; systemd.user.services.pipewire.environment."PIPEWIRE_LINK_PASSIVE" = "1";

9
pkgs/applications/editors/vscode/generic.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, makeDesktopItem { stdenv, lib, makeDesktopItem
, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook , unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook
, gtk2, atomEnv, at-spi2-atk, autoPatchelfHook , gtk2, atomEnv, at-spi2-atk, autoPatchelfHook
, systemd, fontconfig, libdbusmenu, buildFHSUserEnvBubblewrap , systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap
, writeShellScriptBin , writeShellScriptBin
# Populate passthru.tests # Populate passthru.tests
@ -98,6 +98,13 @@ let
runHook postInstall runHook postInstall
''; '';
preFixup = ''
gappsWrapperArgs+=(
# Add gio to PATH so that moving files to the trash works when not using a desktop environment
--prefix PATH : ${glib.bin}/bin
)
'';
inherit meta; inherit meta;
}; };

11
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -10,9 +10,13 @@ let
copyGemFiles = true; copyGemFiles = true;
gemdir = ./.; gemdir = ./.;
}; };
in buildGoModule rec {
version = "14.2.1"; version = "14.2.1";
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
in
buildGoModule {
pname = "gitaly"; pname = "gitaly";
inherit version;
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
@ -27,6 +31,10 @@ in buildGoModule rec {
inherit rubyEnv; inherit rubyEnv;
}; };
buildFlagsArray = [
"-ldflags= -X ${gitaly_package}/internal/version.version=${version} -X ${gitaly_package}/internal/version.moduleVersion=${version}"
];
buildFlags = [ "-tags=static,system_libgit2" ]; buildFlags = [ "-tags=static,system_libgit2" ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
@ -35,6 +43,7 @@ in buildGoModule rec {
postInstall = '' postInstall = ''
mkdir -p $ruby mkdir -p $ruby
cp -rv $src/ruby/{bin,lib,proto,git-hooks} $ruby cp -rv $src/ruby/{bin,lib,proto,git-hooks} $ruby
mv $out/bin/gitaly-git2go $out/bin/gitaly-git2go-${version}
''; '';
outputs = [ "out" "ruby" ]; outputs = [ "out" "ruby" ];