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

atom: fix library paths

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-13 18:30:38 +03:00
parent 9b9fea305f
commit 39eefc0cd0
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/editors/atom/default.nix
View File

@ -1,19 +1,19 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib { stdenv, fetchurl, lib, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, gvfs, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd , gvfs, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd
}: }:
let let
atomEnv = buildEnv { atomPkgs = [
name = "env-atom"; stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3
paths = [ fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcursor libcap systemd
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr ];
xorg.libXcursor libcap systemd atomLib = lib.makeLibraryPath atomPkgs;
]; atomLib64 = lib.makeSearchPathOutputs "lib64" ["lib"] atomPkgs;
};
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "atom-${version}"; name = "atom-${version}";
version = "1.6.2"; version = "1.6.2";
@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
name = "${name}.deb"; name = "${name}.deb";
}; };
buildInputs = [ atomEnv gvfs makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
phases = [ "installPhase" "fixupPhase" ]; phases = [ "installPhase" "fixupPhase" ];
@ -41,10 +41,10 @@ in stdenv.mkDerivation rec {
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
$out/share/atom/resources/app/apm/bin/node $out/share/atom/resources/app/apm/bin/node
wrapProgram $out/bin/atom \ wrapProgram $out/bin/atom \
--prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" \ --prefix "LD_LIBRARY_PATH" : "${atomLib}:${atomLib64}" \
--prefix "PATH" : "${gvfs}/bin" --prefix "PATH" : "${gvfs}/bin"
wrapProgram $out/bin/apm \ wrapProgram $out/bin/apm \
--prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" --prefix "LD_LIBRARY_PATH" : "${atomLib}:${atomLib64}"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {