sublime3: fix plugin_host (close #2804)
Also move the binaries in their own package, so it doesn't pollute the profile.
This commit is contained in:
parent
f8e108c865
commit
d619f0ef6d
@ -1,40 +1,63 @@
|
|||||||
{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango}:
|
{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango, makeWrapper}:
|
||||||
let
|
|
||||||
libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango];
|
|
||||||
in
|
|
||||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
let
|
||||||
name = "sublimetext3-3.0.59";
|
build = "3059";
|
||||||
|
libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango];
|
||||||
|
in let
|
||||||
|
# package with just the binaries
|
||||||
|
sublime = stdenv.mkDerivation {
|
||||||
|
name = "sublimetext3-${build}-bin";
|
||||||
|
|
||||||
src =
|
src =
|
||||||
if stdenv.system == "i686-linux" then
|
if stdenv.system == "i686-linux" then
|
||||||
fetchurl {
|
fetchurl {
|
||||||
name = "sublimetext-3.0.59.tar.bz2";
|
name = "sublimetext-3.0.59.tar.bz2";
|
||||||
url = http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_3059_x32.tar.bz2;
|
url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x32.tar.bz2";
|
||||||
sha256 = "5ee7b42b5db057108e97b86fd408124fc3f7b56662b2851f59d91f8f0c288088";
|
sha256 = "5ee7b42b5db057108e97b86fd408124fc3f7b56662b2851f59d91f8f0c288088";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
fetchurl {
|
fetchurl {
|
||||||
name = "sublimetext-3.0.59.tar.bz2";
|
name = "sublimetext-3.0.59.tar.bz2";
|
||||||
url = http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_3059_x64.tar.bz2;
|
url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x64.tar.bz2";
|
||||||
sha256 = "da3039687664d33a734cea0151b2291ece9c7f35e5b73df5b2b5eac28a20b972";
|
sha256 = "da3039687664d33a734cea0151b2291ece9c7f35e5b73df5b2b5eac28a20b972";
|
||||||
};
|
};
|
||||||
buildCommand = ''
|
|
||||||
tar xvf ${src}
|
|
||||||
mkdir -p $out/bin
|
|
||||||
mv sublime_text_3 $out/sublime
|
|
||||||
ln -s $out/sublime/sublime_text $out/bin/sublime
|
|
||||||
ln -s $out/sublime/sublime_text $out/bin/sublime3
|
|
||||||
|
|
||||||
echo ${libPath}
|
dontStrip = true;
|
||||||
|
dontPatchELF = true;
|
||||||
|
buildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
for i in sublime_text plugin_host crash_reporter; do
|
||||||
patchelf \
|
patchelf \
|
||||||
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
||||||
--set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
|
--set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
|
||||||
$out/sublime/sublime_text
|
$i
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out
|
||||||
|
cp -prvd * $out/
|
||||||
|
# Without this, plugin_host crashes, even though it has the rpath
|
||||||
|
wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
in stdenv.mkDerivation {
|
||||||
|
name = "sublimetext3-${build}";
|
||||||
|
|
||||||
|
phases = [ "installPhase" ];
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
ln -s ${sublime}/sublime_text $out/bin/sublime
|
||||||
|
ln -s ${sublime}/sublime_text $out/bin/sublime3
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Sophisticated text editor for code, markup and prose";
|
description = "Sophisticated text editor for code, markup and prose";
|
||||||
|
maintainers = stdenv.lib.maintainers.wmertens;
|
||||||
license = "unfree";
|
license = "unfree";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user