eb04659fc2
This was achieved using the following command:
sd 'wrapGAppsHook\b' wrapGAppsHook3 (rg -l 'wrapGAppsHook\b')
And then manually reverted the following changes:
- alias in top-level.nix
- function name in wrap-gapps-hook.sh
- comment in postFixup of at-spi2-core
- comment in gtk4
- comment in preFixup of 1password-gui/linux.nix
- comment in postFixup of qgis/unwrapped-ltr.nix and qgis/unwrapped.nix
- comment in postFixup of telegram-desktop
- comment in postFixup of fwupd
- buildCommand of mongodb-compass
- postFixup of xflux-gui
- comment in a patch in kdePackages.kde-gtk-config and plasma5Packages.kde-gtk-config
- description of programs.sway.wrapperFeatures.gtk NixOS option (manual rebuild)
141 lines
3.8 KiB
Nix
141 lines
3.8 KiB
Nix
{ lib
|
|
, stdenv
|
|
, pname
|
|
, version
|
|
, src
|
|
, meta
|
|
, makeShellWrapper
|
|
, wrapGAppsHook3
|
|
, alsa-lib
|
|
, at-spi2-atk
|
|
, at-spi2-core
|
|
, atk
|
|
, cairo
|
|
, cups
|
|
, dbus
|
|
, expat
|
|
, gdk-pixbuf
|
|
, glib
|
|
, gtk3
|
|
, libX11
|
|
, libXcomposite
|
|
, libXdamage
|
|
, libXext
|
|
, libXfixes
|
|
, libXrandr
|
|
, libdrm
|
|
, libxcb
|
|
, libxkbcommon
|
|
, libxshmfence
|
|
, libGL
|
|
, libappindicator-gtk3
|
|
, mesa
|
|
, nspr
|
|
, nss
|
|
, pango
|
|
, systemd
|
|
, udev
|
|
, xdg-utils
|
|
|
|
# The 1Password polkit file requires a list of users for whom polkit
|
|
# integrations should be enabled. This should be a list of strings that
|
|
# correspond to usernames.
|
|
, polkitPolicyOwners ? []
|
|
}:
|
|
let
|
|
# Convert the polkitPolicyOwners variable to a polkit-compatible string for the polkit file.
|
|
policyOwners = lib.concatStringsSep " " (map (user: "unix-user:${user}") polkitPolicyOwners);
|
|
|
|
in stdenv.mkDerivation {
|
|
inherit pname version src meta;
|
|
|
|
nativeBuildInputs = [ makeShellWrapper wrapGAppsHook3 ];
|
|
buildInputs = [ glib ];
|
|
|
|
dontConfigure = true;
|
|
dontBuild = true;
|
|
dontPatchELF = true;
|
|
dontWrapGApps = true;
|
|
|
|
installPhase =
|
|
let rpath = lib.makeLibraryPath [
|
|
alsa-lib
|
|
at-spi2-atk
|
|
at-spi2-core
|
|
atk
|
|
cairo
|
|
cups
|
|
dbus
|
|
expat
|
|
gdk-pixbuf
|
|
glib
|
|
gtk3
|
|
libX11
|
|
libXcomposite
|
|
libXdamage
|
|
libXext
|
|
libXfixes
|
|
libXrandr
|
|
libdrm
|
|
libxcb
|
|
libxkbcommon
|
|
libxshmfence
|
|
libGL
|
|
libappindicator-gtk3
|
|
mesa
|
|
nspr
|
|
nss
|
|
pango
|
|
systemd
|
|
] + ":${stdenv.cc.cc.lib}/lib64";
|
|
in ''
|
|
runHook preInstall
|
|
|
|
mkdir -p $out/bin $out/share/1password
|
|
cp -a * $out/share/1password
|
|
|
|
# Desktop file
|
|
install -Dt $out/share/applications resources/${pname}.desktop
|
|
substituteInPlace $out/share/applications/${pname}.desktop \
|
|
--replace 'Exec=/opt/1Password/${pname}' 'Exec=${pname}'
|
|
|
|
'' + (lib.optionalString (polkitPolicyOwners != [ ])
|
|
''
|
|
# Polkit file
|
|
mkdir -p $out/share/polkit-1/actions
|
|
substitute com.1password.1Password.policy.tpl $out/share/polkit-1/actions/com.1password.1Password.policy --replace "\''${POLICY_OWNERS}" "${policyOwners}"
|
|
'') + ''
|
|
|
|
# Icons
|
|
cp -a resources/icons $out/share
|
|
|
|
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
|
|
patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-LastPass-Exporter,op-ssh-sign}
|
|
patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-LastPass-Exporter,op-ssh-sign}
|
|
for file in $(find $out -type f -name \*.so\* ); do
|
|
patchelf --set-rpath ${rpath}:$out/share/1password $file
|
|
done
|
|
|
|
ln -s $out/share/1password/op-ssh-sign $out/bin/op-ssh-sign
|
|
|
|
runHook postInstall
|
|
'';
|
|
|
|
preFixup = ''
|
|
# makeWrapper defaults to makeBinaryWrapper due to wrapGAppsHook
|
|
# but we need a shell wrapper specifically for `NIXOS_OZONE_WL`.
|
|
# Electron is trying to open udev via dlopen()
|
|
# and for some reason that doesn't seem to be impacted from the rpath.
|
|
# Adding udev to LD_LIBRARY_PATH fixes that.
|
|
# Make xdg-open overrideable at runtime.
|
|
makeShellWrapper $out/share/1password/1password $out/bin/1password \
|
|
"''${gappsWrapperArgs[@]}" \
|
|
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
|
|
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
|
|
# Currently half broken on wayland (e.g. no copy functionality)
|
|
# See: https://github.com/NixOS/nixpkgs/pull/232718#issuecomment-1582123406
|
|
# Remove this comment when upstream fixes:
|
|
# https://1password.community/discussion/comment/624011/#Comment_624011
|
|
#--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
|
'';
|
|
}
|