public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

franz: switch to autoPatchelfHook

Browse Source
This commit is contained in:
gnidorah 2018-05-17 22:43:51 +03:00
parent 4a761a8c6f
commit 33a94b0448
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/networking/instant-messengers/franz/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper { stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
@ -8,17 +8,6 @@ let
version = "4.0.4"; version = "4.0.4";
runtimeDeps = [
udev libnotify
];
deps = (with xorg; [
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver
]) ++ [
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
] ++ runtimeDeps;
desktopItem = makeDesktopItem rec { desktopItem = makeDesktopItem rec {
name = "Franz"; name = "Franz";
exec = name; exec = name;
@ -39,16 +28,21 @@ in stdenv.mkDerivation rec {
# don't remove runtime deps # don't remove runtime deps
dontPatchELF = true; dontPatchELF = true;
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
buildInputs = (with xorg; [
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver
]) ++ [
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
];
runtimeDependencies = [ udev.lib libnotify ];
unpackPhase = '' unpackPhase = ''
tar xzf $src tar xzf $src
''; '';
installPhase = '' installPhase = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz
patchelf --set-rpath "$out/opt/franz:${stdenv.lib.makeLibraryPath deps}" Franz
mkdir -p $out/bin $out/opt/franz mkdir -p $out/bin $out/opt/franz
cp -r * $out/opt/franz cp -r * $out/opt/franz
ln -s $out/opt/franz/Franz $out/bin ln -s $out/opt/franz/Franz $out/bin