From e65617d8238d647fcd63938a8fbad9a7ed9de7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 4 Sep 2018 08:44:21 -0300 Subject: [PATCH 1/2] deepin-shortcut-viewer: init at 1.3.5 --- .../deepin/deepin-shortcut-viewer/default.nix | 37 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 38 insertions(+) create mode 100644 pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix new file mode 100644 index 000000000000..1bb112b76f6e --- /dev/null +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, + qt5integration +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-shortcut-viewer"; + version = "1.3.5"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "13vz8kjdqkrhgpvdgrvwn62vwzbyqp88hjm5m4rcqg3bh56709ma"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + ]; + + buildInputs = [ + dtkcore + dtkwidget + qt5integration + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Pop-up shortcut viewer for Deepin applications"; + homepage = https://github.com/linuxdeepin/deepin-shortcut-viewer; + 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 15e108a651aa..d8fc63e4f912 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -8,6 +8,7 @@ let deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; deepin-icon-theme = callPackage ./deepin-icon-theme { }; deepin-menu = callPackage ./deepin-menu { }; + deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; deepin-terminal = callPackage ./deepin-terminal { inherit (pkgs.gnome3) libgee vte; wnck = pkgs.libwnck3; From b99077f5b13860f1fed05c69fa71d7e0a0379cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 4 Sep 2018 08:45:16 -0300 Subject: [PATCH 2/2] deepin-terminal: add dependency on deepin-shortcut-viewer; enable parallel building --- .../deepin/deepin-terminal/default.nix | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 2ce7885807ac..26146b8ab477 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, - json-glib, gobjectIntrospection, deepin-menu }: + json-glib, gobjectIntrospection, deepin-menu, deepin-shortcut-viewer +}: stdenv.mkDerivation rec { name = "deepin-terminal-${version}"; @@ -27,12 +28,27 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - pkgconfig vala cmake ninja gettext - # For setup hook - gobjectIntrospection + pkgconfig + vala + cmake + ninja + gettext + gobjectIntrospection # For setup hook ]; - buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib deepin-menu ]; + buildInputs = [ + gtk3 + vte + libgee + wnck + librsvg + libsecret + json-glib + deepin-menu + deepin-shortcut-viewer + ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "The default terminal emulation for Deepin";