diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2017-04-23 21:10:35 +0300 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2017-04-23 19:10:35 +0100 |
| commit | 749d495cb3a8d0d704fc157c92307c08a1a39f99 (patch) | |
| tree | c8d41e31587be68530fad6d4d2e07916cbf3b0f0 /pkgs/applications/networking/instant-messengers/franz | |
| parent | 4700da04ca02c486942e4eaf7f3cee63fd676537 (diff) | |
rambox, franz: cleanup (#25020)
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/franz')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/franz/default.nix | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index ef84f6402b52e..d5ef754e173a8 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -25,15 +25,18 @@ in stdenv.mkDerivation rec { "16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy"; }; - phases = [ "unpackPhase" "installPhase" "postFixup" ]; + # don't remove runtime deps + dontPatchELF = true; - deps = with xorg; [ - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes - libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib - cups expat stdenv.cc.cc - - 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 + # runtime deps + ] ++ [ + udev libnotify ]; unpackPhase = '' @@ -42,19 +45,20 @@ in stdenv.mkDerivation rec { installPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz - patchelf --set-rpath "$out/share/franz:${stdenv.lib.makeLibraryPath deps}" Franz + patchelf --set-rpath "$out/opt/franz:${stdenv.lib.makeLibraryPath deps}" Franz - mkdir -p $out/bin $out/share/franz - cp -r * $out/share/franz - ln -s $out/share/franz/Franz $out/bin + mkdir -p $out/bin $out/opt/franz + cp -r * $out/opt/franz + ln -s $out/opt/franz/Franz $out/bin + # provide desktop item and icon mkdir -p $out/share/applications $out/share/pixmaps ln -s ${desktopItem}/share/applications/* $out/share/applications - ln -s $out/share/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps + ln -s $out/opt/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps ''; postFixup = '' - paxmark m $out/share/franz/Franz + paxmark m $out/opt/franz/Franz ''; meta = with stdenv.lib; { |