summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/editors/atom
diff options
context:
space:
mode:
authorTobias Happ <Gerschtli@users.noreply.github.com>2018-06-26 20:22:15 +0200
committerxeji <36407913+xeji@users.noreply.github.com>2018-06-26 20:22:15 +0200
commit9e02afcd80043f57e193bdc0f31a7745ffd2164f (patch)
treec143d4d96a4dec2fbd3a328af49b3340ae301797 /pkgs/applications/editors/atom
parentd85aae23238cc1127fdb56eeaec6aebb7539b09a (diff)
atom-beta: fix build (#42622)
Diffstat (limited to 'pkgs/applications/editors/atom')
-rw-r--r--pkgs/applications/editors/atom/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index c37064ee6000..6efa831d2588 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,7 +1,7 @@
{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
let
- common = pname: {version, sha256}: stdenv.mkDerivation rec {
+ common = pname: {version, sha256, beta}: stdenv.mkDerivation rec {
name = "${pname}-${version}";
inherit version;
@@ -36,7 +36,7 @@ let
--set-rpath "${atomEnv.libPath}" \
$share/resources/app/apm/bin/node
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- $out/share/atom/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux
+ $out/share/atom${lib.optionalString beta "-beta"}/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux
dugite=$share/resources/app.asar.unpacked/node_modules/dugite
rm -f $dugite/git/bin/git
@@ -62,10 +62,12 @@ in stdenv.lib.mapAttrs common {
atom = {
version = "1.28.0";
sha256 = "0k09316897qb9ypkqm6w78nz7sj5385xfdm9bm97m8pka7v61g7h";
+ beta = false;
};
atom-beta = {
version = "1.29.0-beta0";
sha256 = "05xk63wsjfssf8ckph2bgrxaf99fhz3gs8n8pira8cc9yjk7diz7";
+ beta = true;
};
}