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

vscode, electron, atom: run fixup phases

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-22 17:44:30 +03:00
parent 071663c1da
commit 253b84a1eb
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/atom \ wrapProgram $out/bin/atom \
--prefix "PATH" : "${gvfs}/bin" --prefix "PATH" : "${gvfs}/bin"
fixupPhase
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}:$out/share/atom" \ --set-rpath "${atomEnv.libPath}:$out/share/atom" \
$out/share/atom/atom $out/share/atom/atom

2
pkgs/applications/editors/vscode/default.nix
View File

@ -47,7 +47,7 @@ in
cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
''; '';
fixupPhase = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}:$out/lib/vscode" \ --set-rpath "${atomEnv.libPath}:$out/lib/vscode" \

2
pkgs/development/tools/electron/default.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
unzip -d $out/lib/electron $src unzip -d $out/lib/electron $src
ln -s $out/lib/electron/electron $out/bin ln -s $out/lib/electron/electron $out/bin
fixupPhase
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}:$out/lib/electron" \ --set-rpath "${atomEnv.libPath}:$out/lib/electron" \