summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-09-04 08:52:17 +0200
committerGitHub <noreply@github.com>2018-09-04 08:52:17 +0200
commit8e9c7e83eafa000d203e27e93043963986264c44 (patch)
tree39f454c5853d848dfd233e468e9e9556d247b08c /pkgs/desktops
parentd62e62e6a8ed8989167accf53736a169f2e3dac0 (diff)
parent3451488235170f5c5fa35abd94d7aebdc5714fb2 (diff)
downloadnixlib-8e9c7e83eafa000d203e27e93043963986264c44.tar
nixlib-8e9c7e83eafa000d203e27e93043963986264c44.tar.gz
nixlib-8e9c7e83eafa000d203e27e93043963986264c44.tar.bz2
nixlib-8e9c7e83eafa000d203e27e93043963986264c44.tar.lz
nixlib-8e9c7e83eafa000d203e27e93043963986264c44.tar.xz
nixlib-8e9c7e83eafa000d203e27e93043963986264c44.tar.zst
nixlib-8e9c7e83eafa000d203e27e93043963986264c44.zip
Merge pull request #46022 from romildo/upd.deepin-menu
deepin-menu: init at 3.3.10
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/deepin/deepin-menu/default.nix40
-rw-r--r--pkgs/desktops/deepin/deepin-terminal/default.nix8
-rw-r--r--pkgs/desktops/deepin/default.nix1
3 files changed, 46 insertions, 3 deletions
diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix
new file mode 100644
index 000000000000..df0dcc379070
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-menu/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget,
+  qt5integration }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "deepin-menu";
+  version = "3.3.10";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "1666821c2irs2hjgr3kvivij6c2fgjva8323kplrz75w2lz518xb";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    qmake
+  ];
+
+  buildInputs = [
+    dtkcore
+    dtkwidget
+    qt5integration
+  ];
+
+  postPatch = ''
+    sed -i deepin-menu.pro -e "s,/usr,$out,"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Deepin menu service";
+    homepage = https://github.com/linuxdeepin/deepin-menu;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 7ace219dbf5d..2ce7885807ac 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }:
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake,
+  ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret,
+  json-glib, gobjectIntrospection, deepin-menu }:
 
 stdenv.mkDerivation rec {
   name = "deepin-terminal-${version}";
@@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
     gobjectIntrospection
   ];
 
-  buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib ];
+  buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib deepin-menu ];
 
   meta = with stdenv.lib; {
     description = "The default terminal emulation for Deepin";
@@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
      '';
     homepage = https://github.com/linuxdeepin/deepin-terminal;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
   };
 }
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index b315df1f39ed..15e108a651aa 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -7,6 +7,7 @@ let
     deepin-gettext-tools = callPackage ./deepin-gettext-tools { };
     deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
     deepin-icon-theme = callPackage ./deepin-icon-theme { };
+    deepin-menu = callPackage ./deepin-menu { };
     deepin-terminal = callPackage ./deepin-terminal {
       inherit (pkgs.gnome3) libgee vte;
       wnck = pkgs.libwnck3;