diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 14:38:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-05 14:38:10 -0500 |
| commit | 56d5963382da1b4848615aa9139e527978c64670 (patch) | |
| tree | 6e76232d7b4fd5cf3034eef18f0e109f2b86bbb0 /pkgs/applications/version-management | |
| parent | 066491c2e18d6277e0765a3647068c93650fcd19 (diff) | |
| parent | 3adc9d04870605ca20969a98fe820535fc7a88a5 (diff) | |
| download | nixlib-56d5963382da1b4848615aa9139e527978c64670.tar nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.gz nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.bz2 nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.lz nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.xz nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.zst nixlib-56d5963382da1b4848615aa9139e527978c64670.zip | |
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps
Wrap Qt applications
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/p4v/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index f82b80067bf2..314c379c4e6d 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, makeWrapper }: +{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, wrapQtAppsHook }: stdenv.mkDerivation rec { name = "p4v-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; dontBuild = true; - nativeBuildInputs = [makeWrapper]; + nativeBuildInputs = [ wrapQtAppsHook ]; ldLibraryPath = lib.makeLibraryPath [ stdenv.cc.cc.lib @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { openssl ]; + dontWrapQtApps = true; installPhase = '' mkdir $out cp -r bin $out @@ -31,10 +32,9 @@ stdenv.mkDerivation rec { for f in $out/bin/*.bin ; do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f - wrapProgram $f \ + wrapQtApp $f \ --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ - --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb \ - --suffix QT_PLUGIN_PATH : ${qtbase.bin}/${qtbase.qtPluginPrefix} + --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb done ''; |