diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-02-24 10:26:22 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-02-24 10:26:22 -0600 |
| commit | 115e8110f7616b15dd8adddc87613a8292bbf933 (patch) | |
| tree | a4c8272d10885c127864e3e4ff94d4d938657fa4 | |
| parent | d36af8e0ae59b5cb33ab355e278bfee7e7535829 (diff) | |
| download | nixpkgs-115e8110f7616b15dd8adddc87613a8292bbf933.tar nixpkgs-115e8110f7616b15dd8adddc87613a8292bbf933.tar.gz nixpkgs-115e8110f7616b15dd8adddc87613a8292bbf933.tar.bz2 nixpkgs-115e8110f7616b15dd8adddc87613a8292bbf933.tar.lz nixpkgs-115e8110f7616b15dd8adddc87613a8292bbf933.tar.xz nixpkgs-115e8110f7616b15dd8adddc87613a8292bbf933.tar.zst nixpkgs-115e8110f7616b15dd8adddc87613a8292bbf933.zip | |
dropbox: wrap for LD_LIBRARY_PATH (runtime loads)
| -rw-r--r-- | pkgs/applications/networking/dropbox/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index ff2e82d18dd..a3958b9512e 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem +{ stdenv, fetchurl, makeDesktopItem, makeWrapper , dbus_libs, gcc, glib, libdrm, libffi, libICE, librsync, libSM , libX11, libXmu, ncurses, popt, qt5, zlib }: @@ -61,11 +61,11 @@ in stdenv.mkDerivation { rm -f .dropbox-dist/dropboxd ''; + buildInputs = [ makeWrapper ]; + installPhase = '' mkdir -p "$out/${appdir}" cp -r ".dropbox-dist/dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" - mkdir -p "$out/bin" - ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox" rm "$out/${appdir}/libdrm.so.2" rm "$out/${appdir}/libffi.so.6" @@ -101,6 +101,10 @@ in stdenv.mkDerivation { mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications/"* $out/share/applications + + mkdir -p "$out/bin" + makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ + --prefix LD_LIBRARY_PATH : "${ldpath}" ''; meta = { |