diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2018-05-17 22:54:57 +0300 |
|---|---|---|
| committer | gnidorah <gnidorah@users.noreply.github.com> | 2018-05-17 22:54:57 +0300 |
| commit | 636fce50fef349302e1e237c7cbb45231c635bd3 (patch) | |
| tree | fafc6805a543c1626710fb527599e443b152a4b5 /pkgs/desktops/maxx | |
| parent | 33a94b0448351215a8d0f5d259327625c53989b7 (diff) | |
| download | nixpkgs-636fce50fef349302e1e237c7cbb45231c635bd3.tar nixpkgs-636fce50fef349302e1e237c7cbb45231c635bd3.tar.gz nixpkgs-636fce50fef349302e1e237c7cbb45231c635bd3.tar.bz2 nixpkgs-636fce50fef349302e1e237c7cbb45231c635bd3.tar.lz nixpkgs-636fce50fef349302e1e237c7cbb45231c635bd3.tar.xz nixpkgs-636fce50fef349302e1e237c7cbb45231c635bd3.tar.zst nixpkgs-636fce50fef349302e1e237c7cbb45231c635bd3.zip | |
maxx: switch to autoPatchelfHook
Diffstat (limited to 'pkgs/desktops/maxx')
| -rw-r--r-- | pkgs/desktops/maxx/default.nix | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix index 69d16c9b20a..10fa745d978 100644 --- a/pkgs/desktops/maxx/default.nix +++ b/pkgs/desktops/maxx/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, libredirect, gcc-unwrapped, bash, gtk-engine-murrine, gtk_engines, librsvg +{ stdenv, fetchurl, makeWrapper, autoPatchelfHook +, libredirect, gcc-unwrapped, bash, gtk-engine-murrine, gtk_engines, librsvg , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm , libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2 @@ -9,11 +10,6 @@ let version = "Indy-1.1.0"; - deps = [ - stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm - libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2 - gdk_pixbuf libGL ncurses - ]; runtime_deps = [ xclock xsettingsd ]; @@ -31,7 +27,12 @@ in stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + buildInputs = [ + stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm + libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2 + gdk_pixbuf libGL ncurses + ]; buildPhase = '' while IFS= read -r -d ''$'\0' i; do @@ -58,15 +59,11 @@ in stdenv.mkDerivation { --prefix PATH : ${stdenv.lib.makeBinPath runtime_deps} while IFS= read -r -d ''$'\0' i; do - if isELF "$i"; then - bin=`patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"; echo $?` - patchelf --set-rpath "$maxx/lib64:$maxx/OpenMotif-2.1.32/lib64:$maxx/OpenMotif-2.3.1/lib64:${stdenv.lib.makeLibraryPath deps}" "$i" - if [ "$bin" -eq 0 ]; then - wrapProgram "$i" \ - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set NIX_REDIRECTS /opt/MaXX=$maxx \ - --prefix PATH : $maxx/sbin - fi + if isExecutable "$i"; then + wrapProgram "$i" \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS /opt/MaXX=$maxx \ + --prefix PATH : $maxx/sbin fi done < <(find "$maxx" -type f -print0) |