pyrox.dev
lol
Merge pull request #40703 from gnidorah/autopatchelf
franz, maxx: switch to autoPatchelfHook
+10
-16
pkgs/applications/networking/instant-messengers/franz/default.nix
+10
-16
pkgs/applications/networking/instant-messengers/franz/default.nix
···
1
-
{ stdenv, fetchurl, makeDesktopItem, makeWrapper
1
+
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook
2
2
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
3
3
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
4
4
···
7
7
else "ia32";
8
8
9
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
10
22
11
desktopItem = makeDesktopItem rec {
23
12
name = "Franz";
···
39
28
# don't remove runtime deps
40
29
dontPatchELF = true;
41
30
42
-
buildInputs = [ makeWrapper ];
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 ];
43
40
44
41
unpackPhase = ''
45
42
tar xzf $src
46
43
'';
47
44
48
45
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
46
mkdir -p $out/bin $out/opt/franz
53
47
cp -r * $out/opt/franz
54
48
ln -s $out/opt/franz/Franz $out/bin
+13
-16
pkgs/desktops/maxx/default.nix
+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