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

Revert "atom-beta: fix build (#42622)"

Browse Source 
This reverts commit 9e02afcd80043f57e193bdc0f31a7745ffd2164f.
This commit is contained in:
Patrick Hilhorst 2018-06-26 20:54:42 +02:00
parent 352995d79b
commit 6f732f6560
No known key found for this signature in database
GPG Key ID: 589BB0A8DAFEF2B2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}: { stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
let let
common = pname: {version, sha256, beta}: stdenv.mkDerivation rec { common = pname: {version, sha256}: stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
inherit version; inherit version;
@ -36,7 +36,7 @@ let
--set-rpath "${atomEnv.libPath}" \ --set-rpath "${atomEnv.libPath}" \
$share/resources/app/apm/bin/node $share/resources/app/apm/bin/node
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
$out/share/atom${lib.optionalString beta "-beta"}/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux $out/share/atom/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux
dugite=$share/resources/app.asar.unpacked/node_modules/dugite dugite=$share/resources/app.asar.unpacked/node_modules/dugite
rm -f $dugite/git/bin/git rm -f $dugite/git/bin/git
@ -62,12 +62,10 @@ in stdenv.lib.mapAttrs common {
atom = { atom = {
version = "1.28.0"; version = "1.28.0";
sha256 = "0k09316897qb9ypkqm6w78nz7sj5385xfdm9bm97m8pka7v61g7h"; sha256 = "0k09316897qb9ypkqm6w78nz7sj5385xfdm9bm97m8pka7v61g7h";
beta = false;
}; };
atom-beta = { atom-beta = {
version = "1.29.0-beta0"; version = "1.29.0-beta0";
sha256 = "05xk63wsjfssf8ckph2bgrxaf99fhz3gs8n8pira8cc9yjk7diz7"; sha256 = "05xk63wsjfssf8ckph2bgrxaf99fhz3gs8n8pira8cc9yjk7diz7";
beta = true;
}; };
} }