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/development/tools/analysis | |
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/development/tools/analysis')
-rw-r--r-- | pkgs/development/tools/analysis/hopper/default.nix | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index 7158ea38c04d..c9214ae7e35d 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs, makeWrapper, lib }: +{ stdenv, fetchurl, pkgs, lib }: stdenv.mkDerivation rec { pname = "hopper"; @@ -16,22 +16,20 @@ stdenv.mkDerivation rec { libbsd.out libffi.out gmpxx.out python27Full.out python27Packages.libxml2 qt5.qtbase zlib xlibs.libX11.out xorg_sys_opengl.out xlibs.libXrender.out gcc-unwrapped.lib ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ]; + + qtWrapperArgs = [ ''--suffix LD_LIBRARY_PATH : ${ldLibraryPath}'' ]; installPhase = '' - mkdir -p $out/bin - mkdir -p $out/lib - mkdir -p $out/share - cp $sourceRoot/opt/hopper-${rev}/bin/Hopper $out/bin/hopper - cp -r $sourceRoot/opt/hopper-${rev}/lib $out - cp -r $sourceRoot/usr/share $out/share + mkdir -p $out/bin + mkdir -p $out/lib + mkdir -p $out/share + cp $sourceRoot/opt/hopper-${rev}/bin/Hopper $out/bin/hopper + cp -r $sourceRoot/opt/hopper-${rev}/lib $out + cp -r $sourceRoot/usr/share $out/share patchelf \ - --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \ - $out/bin/hopper - # Details: https://nixos.wiki/wiki/Qt - wrapProgram $out/bin/hopper \ - --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ - --suffix QT_PLUGIN_PATH : ${pkgs.qt5.qtbase}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins + --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \ + $out/bin/hopper ''; meta = { |