From e37340b49a874e7fd5357fbc0f001d6e642903a0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 16 Jun 2015 15:26:37 +0000
Subject: gnome-pomodoro: move from apps to misc

---
 .../gnome-3/3.16/apps/pomodoro/default.nix         | 50 ----------------------
 pkgs/desktops/gnome-3/3.16/default.nix             |  4 +-
 .../gnome-3/3.16/misc/pomodoro/default.nix         | 50 ++++++++++++++++++++++
 3 files changed, 52 insertions(+), 52 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
deleted file mode 100644
index 650d978277bd..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
-  dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base,
-  glib, gobjectIntrospection, hicolor_icon_theme, telepathy_glib
-}:
-
-stdenv.mkDerivation rec {
-  rev = "624945d";
-  name = "gnome-shell-pomodoro-${gnome3.version}-${rev}";
-
-  src = fetchFromGitHub {
-      owner = "codito";
-      repo = "gnome-pomodoro";
-      rev = "${rev}";
-      sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq";
-  };
-
-  configureScript = ''./autogen.sh'';
-
-  buildInputs = [
-    which automake113x intltool glib gobjectIntrospection pkgconfig libtool
-    makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
-    gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
-    gnome3.gnome_common gnome3.gnome_shell hicolor_icon_theme gtk3
-    telepathy_glib
-  ];
-
-  preBuild = ''
-    sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \
-      vapi/Makefile
-  '';
-
-  preFixup = ''
-    wrapProgram $out/bin/gnome-pomodoro \
-        --prefix XDG_DATA_DIRS : \
-        "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/codito/gnome-shell-pomodoro;
-    description = "A time management utility for GNOME based on the pomodoro technique";
-    longDescription = ''
-      This GNOME utility helps to manage time according to Pomodoro Technique.
-      It intends to improve productivity and focus by taking short breaks.
-    '';
-    maintainers = with maintainers; [ DamienCassou jgeerds ];
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 77f45d681a01..0c3d49f769f6 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -271,8 +271,6 @@ let
 
   seahorse = callPackage ./apps/seahorse { };
 
-  pomodoro = callPackage ./apps/pomodoro { };
-
   vinagre = callPackage ./apps/vinagre { };
 
 #### Dev http://ftp.gnome.org/pub/GNOME/devtools/
@@ -311,6 +309,8 @@ let
 
   gtkhtml = callPackage ./misc/gtkhtml { };
 
+  pomodoro = callPackage ./misc/pomodoro { };
+
     };
   in self; # pkgsFun
 
diff --git a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix
new file mode 100644
index 000000000000..650d978277bd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
+  dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base,
+  glib, gobjectIntrospection, hicolor_icon_theme, telepathy_glib
+}:
+
+stdenv.mkDerivation rec {
+  rev = "624945d";
+  name = "gnome-shell-pomodoro-${gnome3.version}-${rev}";
+
+  src = fetchFromGitHub {
+      owner = "codito";
+      repo = "gnome-pomodoro";
+      rev = "${rev}";
+      sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq";
+  };
+
+  configureScript = ''./autogen.sh'';
+
+  buildInputs = [
+    which automake113x intltool glib gobjectIntrospection pkgconfig libtool
+    makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+    gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
+    gnome3.gnome_common gnome3.gnome_shell hicolor_icon_theme gtk3
+    telepathy_glib
+  ];
+
+  preBuild = ''
+    sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \
+      vapi/Makefile
+  '';
+
+  preFixup = ''
+    wrapProgram $out/bin/gnome-pomodoro \
+        --prefix XDG_DATA_DIRS : \
+        "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/codito/gnome-shell-pomodoro;
+    description = "A time management utility for GNOME based on the pomodoro technique";
+    longDescription = ''
+      This GNOME utility helps to manage time according to Pomodoro Technique.
+      It intends to improve productivity and focus by taking short breaks.
+    '';
+    maintainers = with maintainers; [ DamienCassou jgeerds ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
-- 
cgit 1.4.1