dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

hopper: fix libxml2 dynamic linking issue

Browse Source 
* port to qt5.callPackage / mkDerivation
* format derivation
This commit is contained in:
Ente 2019-12-11 18:34:41 +01:00
parent 2cbb2590aa
commit 7b1b72c853
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/development/tools/analysis/hopper/default.nix
View File

@ -1,6 +1,21 @@
{ stdenv, fetchurl, pkgs, lib }:
{ mkDerivation, stdenv, fetchurl, pkgs, lib, qtbase }:
let
stdenv.mkDerivation rec {
ldLibraryPath = with pkgs; stdenv.lib.makeLibraryPath [
libbsd.out
libffi.out
gmpxx.out
python27Full.out
python27Packages.libxml2.out
qt5.qtbase
zlib
xlibs.libX11.out
xorg_sys_opengl.out
xlibs.libXrender.out
gcc-unwrapped.lib
];
in mkDerivation rec {
pname = "hopper";
version = "4.5.7";
rev = "v${lib.versions.major version}";
@ -12,13 +27,13 @@ stdenv.mkDerivation rec {
sourceRoot = ".";
ldLibraryPath = with pkgs; stdenv.lib.makeLibraryPath [
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
buildInputs = [
qtbase
];
nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
qtWrapperArgs = [ ''--suffix LD_LIBRARY_PATH : ${ldLibraryPath}'' ];
qtWrapperArgs = [
''--suffix LD_LIBRARY_PATH : ${ldLibraryPath}''
];
installPhase = ''
mkdir -p $out/bin

2
pkgs/top-level/all-packages.nix
View File

@ -1831,7 +1831,7 @@ in
hostsblock = callPackage ../tools/misc/hostsblock { };
hopper = callPackage ../development/tools/analysis/hopper {};
hopper = qt5.callPackage ../development/tools/analysis/hopper {};
hr = callPackage ../applications/misc/hr { };