mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 06:31:02 +00:00
franz: switch to autoPatchelfHook
This commit is contained in:
parent
4a761a8c6f
commit
33a94b0448
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue