diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 10:42:08 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 10:42:08 -0500 |
| commit | 51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2 (patch) | |
| tree | 0b9751f2bfd16a70e406b420c34a8d4097ad9492 /pkgs/applications/misc/keepassx | |
| parent | f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e (diff) | |
| download | nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.gz nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.bz2 nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.lz nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.xz nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.zst nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.zip | |
wrapQtAppsHook: Remove ad hoc Qt wrappers
Diffstat (limited to 'pkgs/applications/misc/keepassx')
| -rw-r--r-- | pkgs/applications/misc/keepassx/community.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index b52cff784e5..7a154e85a6e 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -17,6 +17,7 @@ , qtsvg , qtx11extras , quazip +, wrapQtAppsHook , yubikey-personalization , zlib @@ -73,12 +74,11 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' export LC_ALL="en_US.UTF-8" - export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" export QT_QPA_PLATFORM=offscreen make test ARGS+="-E testgui --output-on-failure" ''; - nativeBuildInputs = [ cmake makeWrapper qttools ]; + nativeBuildInputs = [ cmake wrapQtAppsHook qttools ]; buildInputs = [ curl @@ -102,10 +102,9 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional withKeePassKeeShareSecure quazip ++ stdenv.lib.optional stdenv.isDarwin qtmacextras; - postInstall = optionalString stdenv.isDarwin '' + preFixup = optionalString stdenv.isDarwin '' # Make it work without Qt in PATH. - wrapProgram $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC \ - --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix} + wrapQtApp $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC ''; meta = { |