summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWORLDofPEACE <worldofpeace@protonmail.ch>2020-10-26 10:47:29 -0400
committerWORLDofPEACE <worldofpeace@protonmail.ch>2020-10-26 10:55:29 -0400
commit53b104bfdbc9ca4d05f42ec4181287ba799e2fc0 (patch)
treeebccdc21940b9bf85fed3103efc2189c5bd5dfe0
parentcinnamon.cinnamon-session: 4.6.1 -> 4.6.2 (diff)
downloadnixpkgs-53b104bfdbc9ca4d05f42ec4181287ba799e2fc0.tar.gz
cinnamon.cjs: don't use fork, 4.6.0 -> 2020-10-19
The code in that fork was been integrated into cjs master https://github.com/linuxmint/cjs/pull/84 (cherry picked from commit feac386ca98d0e285c7468d0f2728de8922c95d3)
-rw-r--r--pkgs/desktops/cinnamon/cjs/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix
index a810bdcc03e1..6471d06cd517 100644
--- a/pkgs/desktops/cinnamon/cjs/default.nix
+++ b/pkgs/desktops/cinnamon/cjs/default.nix
@@ -27,14 +27,14 @@
}:
stdenv.mkDerivation rec {
- pname = "cjs";
- version = "4.6.0-gjs-1.66.0";
+ pname = "cjs-unstable";
+ version = "2020-10-19";
src = fetchFromGitHub {
- owner = "leigh123linux";
- repo = pname;
- rev = "gjs-1.66.0";
- sha256 = "1pccz7h8mwljziflhn04gmfnbl99pvcj1byz1c6zn947v5gqskj1";
+ owner = "linuxmint";
+ repo = "cjs";
+ rev = "befc11adb5ba10681464e6fa81b1a79f108ce61c";
+ hash = "sha256-F2t8uKV2r29NxX2+3mYp5x1bug2lwihJZTK1dSS8rPg=";
};
outputs = [ "out" "dev" ];