From ff8d974ec0350956601d0d0b1e15b65f900ab803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 3 Sep 2018 22:45:51 -0300 Subject: [PATCH 1/2] deepin-menu: init at 3.3.10 --- pkgs/desktops/deepin/deepin-menu/default.nix | 40 ++++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/desktops/deepin/deepin-menu/default.nix diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix new file mode 100644 index 0000000000000..df0dcc3790701 --- /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/default.nix b/pkgs/desktops/deepin/default.nix index b315df1f39edc..15e108a651aaf 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; From 3451488235170f5c5fa35abd94d7aebdc5714fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 3 Sep 2018 23:06:56 -0300 Subject: [PATCH 2/2] deepin-terminal: add dependency on deepin-menu --- pkgs/desktops/deepin/deepin-terminal/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 7ace219dbf5d3..2ce7885807ac9 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 ]; }; }