ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

remove nodewebkit patch code and upgrade zed to 0.13

Browse Source
This commit is contained in:
Matej Cotman 2014-09-13 10:03:01 +02:00
parent 77fa9da425
commit bca3e21d81
2 changed files with 907 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/applications/editors/zed/default.nix
View File

@ -1,19 +1,9 @@
{ stdenv, buildEnv, fetchgit, xlibs, glib, gtk2, atk, pango, gdk_pixbuf,
cairo, freetype, fontconfig, nss, nspr, gnome, alsaLib, expat, dbus, udev,
makeWrapper, writeScript, fetchurl, zip, pkgs, node_webkit }:
{ stdenv, buildEnv, fetchgit, makeWrapper, writeScript, fetchurl, zip, pkgs
, node_webkit }:
let
name = "zed-${version}";
version = "0.12";
rpath_env = buildEnv {
name = "rpath_env";
paths = [ xlibs.libX11 xlibs.libXrender glib xlibs.libXtst gtk2 atk pango
gdk_pixbuf cairo freetype fontconfig xlibs.libXi xlibs.libXcomposite
nss nspr gnome.GConf xlibs.libXext xlibs.libXfixes alsaLib
xlibs.libXdamage expat dbus stdenv.gcc ];
pathsToLink = [ "/lib" "/lib64" ];
};
version = "0.13";
# When upgrading node.nix / node packages:
# fetch package.json from Zed's repository
@ -29,8 +19,10 @@ let
node_env = buildEnv {
name = "node_env";
paths = [ nodePackages.tar nodePackages.request ];
paths = [ nodePackages."body-parser" nodePackages.express
nodePackages.request nodePackages.tar nodePackages.ws ];
pathsToLink = [ "/lib" ];
ignoreCollisions = true;
};
zed = stdenv.mkDerivation rec {
@ -39,7 +31,7 @@ let
src = fetchgit {
url = "git://github.com/zedapp/zed";
rev = "refs/tags/v${version}";
sha256 = "1l1adj4p916km626vxg1lv0bapzay4z5nq005pxsbjbcycrhds59";
sha256 = "023nq4y6dgh57xpsgawdn2zqvfyhjz1p00ldnsfsjajyy4nn6yb1";
};
buildInputs = [ makeWrapper zip ];
@ -62,14 +54,7 @@ let
'';
postFixup = ''
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/zed/zed-bin
patchelf --set-rpath "${rpath_env}/lib:${rpath_env}/lib64" $out/zed/zed-bin
mkdir -p $out/lib
ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0
wrapProgram $out/zed/zed-bin \
--prefix LD_LIBRARY_PATH : $out/lib \
--prefix NODE_PATH : ${node_env}/lib/node_modules
'';
};

925
pkgs/applications/editors/zed/node.nix
View File

File diff suppressed because it is too large Load Diff