maxx: switch to autoPatchelfHook

gnidorah 636fce50 33a94b04

+13 -16
+13 -16
pkgs/desktops/maxx/default.nix
··· 1 - { stdenv, fetchurl, makeWrapper, libredirect, gcc-unwrapped, bash, gtk-engine-murrine, gtk_engines, librsvg 1 + { stdenv, fetchurl, makeWrapper, autoPatchelfHook 2 + , libredirect, gcc-unwrapped, bash, gtk-engine-murrine, gtk_engines, librsvg 2 3 3 4 , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm 4 5 , libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2 ··· 9 10 let 10 11 version = "Indy-1.1.0"; 11 12 12 - deps = [ 13 - stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm 14 - libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2 15 - gdk_pixbuf libGL ncurses 16 - ]; 17 13 runtime_deps = [ 18 14 xclock xsettingsd 19 15 ]; ··· 31 27 }) 32 28 ]; 33 29 34 - nativeBuildInputs = [ makeWrapper ]; 30 + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; 31 + buildInputs = [ 32 + stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm 33 + libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2 34 + gdk_pixbuf libGL ncurses 35 + ]; 35 36 36 37 buildPhase = '' 37 38 while IFS= read -r -d ''$'\0' i; do ··· 58 59 --prefix PATH : ${stdenv.lib.makeBinPath runtime_deps} 59 60 60 61 while IFS= read -r -d ''$'\0' i; do 61 - if isELF "$i"; then 62 - bin=`patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"; echo $?` 63 - patchelf --set-rpath "$maxx/lib64:$maxx/OpenMotif-2.1.32/lib64:$maxx/OpenMotif-2.3.1/lib64:${stdenv.lib.makeLibraryPath deps}" "$i" 64 - if [ "$bin" -eq 0 ]; then 65 - wrapProgram "$i" \ 66 - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ 67 - --set NIX_REDIRECTS /opt/MaXX=$maxx \ 68 - --prefix PATH : $maxx/sbin 69 - fi 62 + if isExecutable "$i"; then 63 + wrapProgram "$i" \ 64 + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ 65 + --set NIX_REDIRECTS /opt/MaXX=$maxx \ 66 + --prefix PATH : $maxx/sbin 70 67 fi 71 68 done < <(find "$maxx" -type f -print0) 72 69