diff options
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/e19/default.nix | 16 | ||||
-rw-r--r-- | pkgs/desktops/e19/enlightenment.nix | 47 | ||||
-rw-r--r-- | pkgs/desktops/enlightenment/default.nix | 41 | ||||
-rw-r--r-- | pkgs/desktops/enlightenment/econnman.nix (renamed from pkgs/desktops/e19/econnman.nix) | 8 | ||||
-rw-r--r-- | pkgs/desktops/enlightenment/efl-elua.patch (renamed from pkgs/desktops/e19/efl-elua.patch) | 0 | ||||
-rw-r--r-- | pkgs/desktops/enlightenment/efl.nix (renamed from pkgs/desktops/e19/efl.nix) | 4 | ||||
-rw-r--r-- | pkgs/desktops/enlightenment/elementary.nix (renamed from pkgs/desktops/e19/elementary.nix) | 8 | ||||
-rw-r--r-- | pkgs/desktops/enlightenment/elementary.patch (renamed from pkgs/desktops/e19/elementary.patch) | 0 | ||||
-rw-r--r-- | pkgs/desktops/enlightenment/emotion.nix (renamed from pkgs/desktops/e19/emotion.nix) | 10 | ||||
-rw-r--r-- | pkgs/desktops/enlightenment/enlightenment.nix | 47 | ||||
-rw-r--r-- | pkgs/desktops/enlightenment/evas.nix (renamed from pkgs/desktops/e19/evas.nix) | 8 | ||||
-rw-r--r-- | pkgs/desktops/enlightenment/rage.nix (renamed from pkgs/desktops/e19/rage.nix) | 4 | ||||
-rw-r--r-- | pkgs/desktops/enlightenment/terminology.nix (renamed from pkgs/desktops/e19/terminology.nix) | 4 | ||||
-rw-r--r-- | pkgs/desktops/xfce/applications/orage.nix | 30 | ||||
-rw-r--r-- | pkgs/desktops/xfce/default.nix | 1 |
15 files changed, 115 insertions, 113 deletions
diff --git a/pkgs/desktops/e19/default.nix b/pkgs/desktops/e19/default.nix deleted file mode 100644 index b285498be9dc..000000000000 --- a/pkgs/desktops/e19/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ 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 { }; - - #### WINDOW MANAGER - enlightenment = callPackage ./enlightenment.nix { }; - - #### APPLICATIONS - econnman = callPackage ./econnman.nix { }; - terminology = callPackage ./terminology.nix { }; - rage = callPackage ./rage.nix { }; -} diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix deleted file mode 100644 index 5112058f8c6c..000000000000 --- a/pkgs/desktops/e19/enlightenment.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e19, xorg, libffi, pam, alsaLib, luajit, bzip2, libuuid -, libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }: - -stdenv.mkDerivation rec { - name = "enlightenment-${version}"; - version = "0.20.3"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "19z3bwdzwpzwi330l5g5mj7xy6wy8xrc39zivjhm0d1ql3fh649j"; - }; - buildInputs = [ pkgconfig e19.efl e19.elementary xorg.libXdmcp xorg.libxcb - xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2 libuuid - libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; - NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" "-I${libuuid}/include/uuid" ]; - preConfigure = '' - export USER_SESSION_DIR=$prefix/lib/systemd/user - - substituteInPlace src/modules/xkbswitch/e_mod_parse.c \ - --replace "/usr/share/X11/xkb/rules/xorg.lst" "${xkeyboard_config}/share/X11/xkb/rules/base.lst" - - substituteInPlace "src/bin/e_import_config_dialog.c" \ - --replace "e_prefix_bin_get()" "\"${e19.efl}/bin\"" - ''; - - enableParallelBuilding = true; - - # this is a hack and without this cpufreq module is not working: - # when set_freqset_setuid is true and "e19_freqset" is set in setuidPrograms (this is taken care of in e19 NixOS module), - # then this postInstall does the folowing: - # 1. moves the "freqset" binary to "e19_freqset", - # 2. linkes "e19_freqset" to enlightenment/bin so that, - # 3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e19_freqset, - # 4. and finaly, linkes /var/setuid-wrappers/e19_freqset to original destination where enlightenment wants it - postInstall = if set_freqset_setuid then '' - export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`; - mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e19_freqset - ln -sv $CPUFREQ_DIRPATH/e19_freqset $out/bin/e19_freqset - ln -sv /var/setuid-wrappers/e19_freqset $CPUFREQ_DIRPATH/freqset - '' else ""; - meta = { - description = "The Compositing Window Manager and Desktop Shell"; - homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 5aa3d781e4b3..b285498be9dc 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 { }; +} diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index 35b58aec638d..0dabd7f1347f 100644 --- a/pkgs/desktops/e19/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, e19, python27, python27Packages, dbus, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, elementary, python2Packages, dbus, makeWrapper }: stdenv.mkDerivation rec { name = "econnman-${version}"; version = "1.1"; @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; }; - buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ]; - propagatedBuildInputs = [ python27Packages.pythonefl_1_16 python27Packages.dbus e19.elementary ]; + buildInputs = [ makeWrapper pkgconfig efl python2Packages.python python2Packages.wrapPython dbus ]; + pythonPath = [ python2Packages.pythonefl python2Packages.dbus elementary ]; postInstall = '' - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_16}/lib/python2.7/site-packages + wrapPythonPrograms ''; meta = { diff --git a/pkgs/desktops/e19/efl-elua.patch b/pkgs/desktops/enlightenment/efl-elua.patch index 96c42b3ff3ca..96c42b3ff3ca 100644 --- a/pkgs/desktops/e19/efl-elua.patch +++ b/pkgs/desktops/enlightenment/efl-elua.patch diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/enlightenment/efl.nix index dd9c837ed8b2..c2124f0b2928 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.16.1"; + version = "1.17.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "116s4lcfj5lrfhyvvka3np9glqyrh21cyl9rhw7al0wgb60vw0gg"; + sha256 = "1zisnz4x54mn9sm46kcr571faqnazkcglyf0lbz19l34syx40df1"; }; buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/enlightenment/elementary.nix index 1793a7e87c47..ffb0d70920eb 100644 --- a/pkgs/desktops/e19/elementary.nix +++ b/pkgs/desktops/enlightenment/elementary.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }: +{ stdenv, fetchurl, pkgconfig, efl, libcap, automake, autoconf, libdrm, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.16.1"; + version = "1.17.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.xz"; - sha256 = "0q58imh7s35q6cq5hsa6gqj84rkckh8s61iass8zyvcw19j66f3y"; + sha256 = "0avb0d6nk4d88l81c2j6py13vdfnvg080ycw2y3qvawyjf1mhska"; }; - buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + buildInputs = [ pkgconfig efl libdrm gdbm automake autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ]; patches = [ ./elementary.patch ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/e19/elementary.patch b/pkgs/desktops/enlightenment/elementary.patch index 32080c81cb38..32080c81cb38 100644 --- a/pkgs/desktops/e19/elementary.patch +++ b/pkgs/desktops/enlightenment/elementary.patch diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/enlightenment/emotion.nix index c38119719a0b..39b3b1620751 100644 --- a/pkgs/desktops/e19/emotion.nix +++ b/pkgs/desktops/enlightenment/emotion.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, e19, vlc }: +{ stdenv, fetchurl, pkgconfig, efl, vlc }: stdenv.mkDerivation rec { name = "emotion_generic_players-${version}"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.xz"; - sha256 = "163ay26c6dx49m1am7vsxxn0gy877zhayxq0yxn9zkbq2srzvjym"; + sha256 = "03kaql95mk0c5j50v3c5i5lmlr3gz7xlh8p8q87xz8zf9j5h1pp7"; }; - buildInputs = [ pkgconfig e19.efl vlc ]; - NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ]; + buildInputs = [ pkgconfig efl vlc ]; + NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" ]; meta = { description = "Extra video decoders"; homepage = http://enlightenment.org/; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix new file mode 100644 index 000000000000..ea232a2c6070 --- /dev/null +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, pkgconfig, efl, elementary, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, +libffi, pam, alsaLib, luajit, bzip2, libuuid, libpthreadstubs, gdbm, libcap, mesa_glu +, xkeyboard_config }: + +stdenv.mkDerivation rec { + name = "enlightenment-${version}"; + version = "0.20.6"; + src = fetchurl { + url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; + sha256 = "11ahll68nlci214ka05whp5l32hy9lznmcdfqx3hxsmq2p7bl7zj"; + }; + buildInputs = [ pkgconfig efl elementary libXdmcp libxcb + xcbutilkeysyms libXrandr libffi pam alsaLib luajit bzip2 libuuid + libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" "-I${efl}/include/emile-1" "-I${libuuid}/include/uuid" ]; + preConfigure = '' + export USER_SESSION_DIR=$prefix/lib/systemd/user + + substituteInPlace src/modules/xkbswitch/e_mod_parse.c \ + --replace "/usr/share/X11/xkb/rules/xorg.lst" "${xkeyboard_config}/share/X11/xkb/rules/base.lst" + + substituteInPlace "src/bin/e_import_config_dialog.c" \ + --replace "e_prefix_bin_get()" "\"${efl}/bin\"" + ''; + + enableParallelBuilding = true; + + # this is a hack and without this cpufreq module is not working. does the following: + # 1. moves the "freqset" binary to "e_freqset", + # 2. linkes "e_freqset" to enlightenment/bin so that, + # 3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e_freqset, + # 4. and finaly, linkes /var/setuid-wrappers/e_freqset to original destination where enlightenment wants it + postInstall = '' + export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`; + mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e_freqset + ln -sv $CPUFREQ_DIRPATH/e_freqset $out/bin/e_freqset + ln -sv /var/setuid-wrappers/e_freqset $CPUFREQ_DIRPATH/freqset + ''; + + meta = { + description = "The Compositing Window Manager and Desktop Shell"; + homepage = http://enlightenment.org/; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/enlightenment/evas.nix index b777dc893d70..fe8897b8be7a 100644 --- a/pkgs/desktops/e19/evas.nix +++ b/pkgs/desktops/enlightenment/evas.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: +{ stdenv, fetchurl, pkgconfig, efl, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: stdenv.mkDerivation rec { name = "evas_generic_loaders-${version}"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.xz"; - sha256 = "1il3i3rii6ddpj7cw2mdqnb0q2wmhwnvs6qi9janna1n5hhrqyfm"; + sha256 = "0ynq1nx0bfgg19p4vki1fap36yyip53zaxpzncx2slr6jcx1kxf2"; }; - buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; + buildInputs = [ pkgconfig efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; meta = { description = "Extra image decoders"; homepage = http://enlightenment.org/; diff --git a/pkgs/desktops/e19/rage.nix b/pkgs/desktops/enlightenment/rage.nix index 19c99ac17eb9..8c3391cf2714 100644 --- a/pkgs/desktops/e19/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, e19, automake, autoconf, libtool, pkgconfig, gst_all_1 +{ stdenv, fetchurl, elementary, efl, automake, autoconf, libtool, pkgconfig, gst_all_1 , makeWrapper, lib }: stdenv.mkDerivation rec { name = "rage-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; sha256 = "10j3n8crk16jzqz2hn5djx6vms5f6x83qyiaphhqx94h9dgv2mgg"; }; - buildInputs = [ e19.elementary e19.efl automake autoconf libtool pkgconfig + buildInputs = [ elementary efl automake autoconf libtool pkgconfig makeWrapper ]; GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [ gst_all_1.gst-plugins-base diff --git a/pkgs/desktops/e19/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index 195a1f436644..a302b7d5f612 100644 --- a/pkgs/desktops/e19/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, e19 }: +{ stdenv, fetchurl, pkgconfig, efl, elementary }: stdenv.mkDerivation rec { name = "terminology-${version}"; version = "0.9.1"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz"; sha256 = "1kwv9vkhngdm5v38q93xpcykghnyawhjjcb5bgy0p89gpbk7mvpc"; }; - buildInputs = [ pkgconfig e19.efl e19.elementary ]; + buildInputs = [ pkgconfig efl elementary ]; meta = { description = "The best terminal emulator written with the EFL"; homepage = http://enlightenment.org/; diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix new file mode 100644 index 000000000000..c26327f4d920 --- /dev/null +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus_glib +, libnotify, popt, xfce +}: + +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; + p_name = "orage"; + ver_maj = "4.12"; + ver_min = "1"; + + src = fetchurl { + url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"; + }; + + nativeBuildInputs = [ pkgconfig intltool bison flex ]; + + buildInputs = [ gtk libical dbus_glib libnotify popt xfce.libxfce4util + xfce.xfce4panel ]; + + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache "; + + meta = { + homepage = http://www.xfce.org/projects/; + description = "A simple calendar application with reminders"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 9453e85d2532..96e6c55162a5 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -51,6 +51,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od gigolo = callPackage ./applications/gigolo.nix { }; mousepad = callPackage ./applications/mousepad.nix { }; + orage = callPackage ./applications/orage.nix { }; parole = callPackage ./applications/parole.nix { }; ristretto = callPackage ./applications/ristretto.nix { }; terminal = xfce4terminal; # it has changed its name |