diff options
author | Janne Heß <janne@hess.ooo> | 2022-05-23 19:56:59 +0200 |
---|---|---|
committer | Janne Heß <janne@hess.ooo> | 2022-05-23 19:56:59 +0200 |
commit | 3673f148b3e71f8dafdb11ba0335253d5659ff9f (patch) | |
tree | b743e44f7c48f9b16fea7c0a662947ae41e45ed1 /pkgs/applications/networking/instant-messengers/discord/linux.nix | |
parent | 41cc1d5d9584103be4108c1815c350e07c807036 (diff) | |
parent | f51499324ca76ffcf2f00caff5fc32b3f3e8237c (diff) | |
download | nixpkgs-3673f148b3e71f8dafdb11ba0335253d5659ff9f.tar nixpkgs-3673f148b3e71f8dafdb11ba0335253d5659ff9f.tar.gz nixpkgs-3673f148b3e71f8dafdb11ba0335253d5659ff9f.tar.bz2 nixpkgs-3673f148b3e71f8dafdb11ba0335253d5659ff9f.tar.lz nixpkgs-3673f148b3e71f8dafdb11ba0335253d5659ff9f.tar.xz nixpkgs-3673f148b3e71f8dafdb11ba0335253d5659ff9f.tar.zst nixpkgs-3673f148b3e71f8dafdb11ba0335253d5659ff9f.zip |
Merge remote-tracking branch 'origin/staging-next'
* origin/staging-next: (62 commits) Re-Revert "lua: fix on darwin by using makeBinaryWrapper (#172749)" openldap: fix cross-compilation makeBinaryWrapper: fix codesign on aarch64-darwin python3Packages.ldap: fix linking with openldap 2.5+ Revert "lua: fix on darwin by using makeBinaryWrapper (#172749)" wine: enable parallel build again pkgsi686Linux.gdb: fix formatting for 32-bit systems gtk4: Fix incorrect merge nixos/openldap: use upstream unit defaults openldap: update maintainers openldap: 2.4.58 -> 2.6.2 Revert "Add mingwW64-llvm cross-system." lua: fix on darwin by using makeBinaryWrapper (#172749) python310Packages.python-mimeparse: execute tests pandas: fix darwin build gtk3: 3.24.33 -> 3.24.33-2022-03-11 gtk4: patch fixing g-c-c crashes e2fsprogs: patch for CVE-2022-1304 firefox-unwrapped: fix cross compilation rustc: expose correct llvmPackages for cross compile ...
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/discord/linux.nix')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/discord/linux.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index f5d984bf3a6..b960caa64d8 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,5 +1,5 @@ { pname, version, src, meta, binaryName, desktopName, autoPatchelfHook -, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeWrapper, alsa-lib, at-spi2-atk +, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf , glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { libxshmfence mesa nss - (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + wrapGAppsHook + makeShellWrapper ]; dontWrapGApps = true; @@ -78,7 +79,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ $out/opt/${binaryName}/${binaryName} - wrapProgram $out/opt/${binaryName}/${binaryName} \ + wrapProgramShell $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ |