diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2018-05-17 22:43:51 +0300 |
|---|---|---|
| committer | gnidorah <gnidorah@users.noreply.github.com> | 2018-05-17 22:43:51 +0300 |
| commit | 33a94b0448351215a8d0f5d259327625c53989b7 (patch) | |
| tree | 59627ceb59bac1d16370675b0282c51b803b19bc /pkgs/applications | |
| parent | 4a761a8c6f305938131dd6ced5070e7292efab94 (diff) | |
| download | nixlib-33a94b0448351215a8d0f5d259327625c53989b7.tar nixlib-33a94b0448351215a8d0f5d259327625c53989b7.tar.gz nixlib-33a94b0448351215a8d0f5d259327625c53989b7.tar.bz2 nixlib-33a94b0448351215a8d0f5d259327625c53989b7.tar.lz nixlib-33a94b0448351215a8d0f5d259327625c53989b7.tar.xz nixlib-33a94b0448351215a8d0f5d259327625c53989b7.tar.zst nixlib-33a94b0448351215a8d0f5d259327625c53989b7.zip | |
franz: switch to autoPatchelfHook
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/franz/default.nix | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 95e01e586ec2..75df17bd5b01 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: @@ -8,17 +8,6 @@ let 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 { name = "Franz"; exec = name; @@ -39,16 +28,21 @@ in stdenv.mkDerivation rec { # don't remove runtime deps 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 = '' tar xzf $src ''; 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 cp -r * $out/opt/franz ln -s $out/opt/franz/Franz $out/bin |