summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-01-06 00:02:03 +0000
committerGitHub <noreply@github.com>2022-01-06 00:02:03 +0000
commit10ea3f9b77185157aa64c79c0799766b76128d11 (patch)
tree6b18a4fdf92d750113b01e891eb15442edce7c0d /pkgs/desktops
parent79e0cc2369bd8536b662ae70a0eb4ff9f0bcd45b (diff)
parent0c8b2ce6c023e664d341e62d7f5cf4616a7e352d (diff)
downloadnixpkgs-10ea3f9b77185157aa64c79c0799766b76128d11.tar
nixpkgs-10ea3f9b77185157aa64c79c0799766b76128d11.tar.gz
nixpkgs-10ea3f9b77185157aa64c79c0799766b76128d11.tar.bz2
nixpkgs-10ea3f9b77185157aa64c79c0799766b76128d11.tar.lz
nixpkgs-10ea3f9b77185157aa64c79c0799766b76128d11.tar.xz
nixpkgs-10ea3f9b77185157aa64c79c0799766b76128d11.tar.zst
nixpkgs-10ea3f9b77185157aa64c79c0799766b76128d11.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/enlightenment/default.nix5
-rw-r--r--pkgs/desktops/enlightenment/ecrire/default.nix36
2 files changed, 39 insertions, 2 deletions
diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix
index 80b4eb58ab5..34b0ae86e4e 100644
--- a/pkgs/desktops/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/default.nix
@@ -8,8 +8,9 @@
 
   #### APPLICATIONS
   econnman = callPackage ./econnman { };
+  ecrire = callPackage ./ecrire { };
+  ephoto = callPackage ./ephoto { };
   evisum = callPackage ./evisum { };
-  terminology = callPackage ./terminology { };
   rage = callPackage ./rage { };
-  ephoto = callPackage ./ephoto { };
+  terminology = callPackage ./terminology { };
 }
diff --git a/pkgs/desktops/enlightenment/ecrire/default.nix b/pkgs/desktops/enlightenment/ecrire/default.nix
new file mode 100644
index 00000000000..d152c943d58
--- /dev/null
+++ b/pkgs/desktops/enlightenment/ecrire/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, stdenv
+, fetchurl
+, meson
+, ninja
+, pkg-config
+, efl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "ecrire";
+  version = "0.2.0";
+
+  src = fetchurl {
+    url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "1pszk583rzclfqy3dyjh1m9pz1hnr84vqz8vw9kngcnmj23mjr6r";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    efl
+  ];
+
+  meta = with lib; {
+    description = "EFL simple text editor";
+    homepage = "https://www.enlightenment.org/";
+    license = licenses.gpl3Only;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}