diff options
author | Robin Gloster <mail@glob.in> | 2016-03-15 01:44:24 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-03-15 01:44:24 +0000 |
commit | 3f45f0948d6fe158bed063adb66850ded0ba4861 (patch) | |
tree | ac717689d391d3f5333132fc34e4b2aed829414c /pkgs/desktops/enlightenment/default.nix | |
parent | a9b942c0617b1cd5f0732d05eadad0114a178f37 (diff) | |
parent | d227d9a70e41d65e4e6f4ac75a9d243c5a19fa85 (diff) |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/desktops/enlightenment/default.nix')
-rw-r--r-- | pkgs/desktops/enlightenment/default.nix | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 5aa3d781e4b3a..b285498be9dc1 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -1,29 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorg, dbus, imlib2, freetype }: +{ callPackage, pkgs }: +rec { + #### CORE EFL + efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; }; + evas = callPackage ./evas.nix { }; + emotion = callPackage ./emotion.nix { }; + elementary = callPackage ./elementary.nix { }; -let version = "0.16.8.15"; in - stdenv.mkDerivation { - name = "enlightenment-${version}"; + #### WINDOW MANAGER + enlightenment = callPackage ./enlightenment.nix { }; - src = fetchurl { - url = "mirror://sourceforge/enlightenment/e16-${version}.tar.gz"; - sha256 = "0f8hg79mrk6b3fsvynvsrnqh1zgmvnnza0lf7qn4pq2mqyigbhgk"; - }; - - buildInputs = [pkgconfig imlib2 freetype - xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXft ]; - - meta = { - description = "Desktop shell built on the Enlightenment Foundation Libraries"; - - longDescription = '' - Enlightenment is a window manager. Enlightenment is a desktop - shell. Enlightenment is the building blocks to create - beautiful applications. Enlightenment, or simply e, is a - group of people trying to make a new generation of software. - ''; - - homepage = http://enlightenment.org/; - - license = "BSD-style"; - }; - } + #### APPLICATIONS + econnman = callPackage ./econnman.nix { }; + terminology = callPackage ./terminology.nix { }; + rage = callPackage ./rage.nix { }; +} |