pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #40703 from gnidorah/autopatchelf

franz, maxx: switch to autoPatchelfHook

authored by

xeji and committed by
GitHub cfc016c7 2921c447

+23 -32
unified split
+10 -16
pkgs/applications/networking/instant-messengers/franz/default.nix
··· 1 - { stdenv, fetchurl, makeDesktopItem, makeWrapper 2 , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig 3 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: 4 ··· 7 else "ia32"; 8 9 version = "4.0.4"; 10 - 11 - runtimeDeps = [ 12 - udev libnotify 13 - ]; 14 - deps = (with xorg; [ 15 - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes 16 - libXrender libX11 libXtst libXScrnSaver 17 - ]) ++ [ 18 - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus 19 - gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc 20 - ] ++ runtimeDeps; 21 22 desktopItem = makeDesktopItem rec { 23 name = "Franz"; ··· 39 # don't remove runtime deps 40 dontPatchELF = true; 41 42 - buildInputs = [ makeWrapper ]; 43 44 unpackPhase = '' 45 tar xzf $src 46 ''; 47 48 installPhase = '' 49 - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz 50 - patchelf --set-rpath "$out/opt/franz:${stdenv.lib.makeLibraryPath deps}" Franz 51 - 52 mkdir -p $out/bin $out/opt/franz 53 cp -r * $out/opt/franz 54 ln -s $out/opt/franz/Franz $out/bin
··· 1 + { stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook 2 , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig 3 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: 4 ··· 7 else "ia32"; 8 9 version = "4.0.4"; 10 11 desktopItem = makeDesktopItem rec { 12 name = "Franz"; ··· 28 # don't remove runtime deps 29 dontPatchELF = true; 30 31 + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; 32 + buildInputs = (with xorg; [ 33 + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes 34 + libXrender libX11 libXtst libXScrnSaver 35 + ]) ++ [ 36 + gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus 37 + gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc 38 + ]; 39 + runtimeDependencies = [ udev.lib libnotify ]; 40 41 unpackPhase = '' 42 tar xzf $src 43 ''; 44 45 installPhase = '' 46 mkdir -p $out/bin $out/opt/franz 47 cp -r * $out/opt/franz 48 ln -s $out/opt/franz/Franz $out/bin
+13 -16
pkgs/desktops/maxx/default.nix
··· 1 - { stdenv, fetchurl, makeWrapper, libredirect, gcc-unwrapped, bash, gtk-engine-murrine, gtk_engines, librsvg 2 3 , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm 4 , libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2 ··· 9 let 10 version = "Indy-1.1.0"; 11 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 runtime_deps = [ 18 xclock xsettingsd 19 ]; ··· 31 }) 32 ]; 33 34 - nativeBuildInputs = [ makeWrapper ]; 35 36 buildPhase = '' 37 while IFS= read -r -d ''$'\0' i; do ··· 58 --prefix PATH : ${stdenv.lib.makeBinPath runtime_deps} 59 60 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 70 fi 71 done < <(find "$maxx" -type f -print0) 72
··· 1 + { stdenv, fetchurl, makeWrapper, autoPatchelfHook 2 + , libredirect, gcc-unwrapped, bash, gtk-engine-murrine, gtk_engines, librsvg 3 4 , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm 5 , libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2 ··· 10 let 11 version = "Indy-1.1.0"; 12 13 runtime_deps = [ 14 xclock xsettingsd 15 ]; ··· 27 }) 28 ]; 29 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 + ]; 36 37 buildPhase = '' 38 while IFS= read -r -d ''$'\0' i; do ··· 59 --prefix PATH : ${stdenv.lib.makeBinPath runtime_deps} 60 61 while IFS= read -r -d ''$'\0' i; do 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 67 fi 68 done < <(find "$maxx" -type f -print0) 69