git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #58634 from romildo/upd.deepin.new

deepin updates

commit34c6922966f69f311098f4bfd37ddf5ee4089ce6 authorworldofpeace <worldofpeace@users.noreply.github.com> dateThu 4 Apr 2019, 19:48 (8 years ago) parent7bff73813ccde5
35 files changed+505−200
pkgs/desktops/deepin/dbus-factory/default.nix+1−1 pkgs/desktops/deepin/dde-api/default.nix+72−24 pkgs/desktops/deepin/dde-api/deps.nix+11−11 pkgs/desktops/deepin/dde-calendar/default.nix+7−3 pkgs/desktops/deepin/dde-daemon/default.nix+39−14 pkgs/desktops/deepin/dde-daemon/deps.nix+13−13 pkgs/desktops/deepin/dde-polkit-agent/default.nix+51 pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix+9−6 pkgs/desktops/deepin/dde-session-ui/default.nix+9−4 pkgs/desktops/deepin/deepin-desktop-base/default.nix+27−13 pkgs/desktops/deepin/deepin-desktop-schemas/default.nix+31−8 pkgs/desktops/deepin/deepin-gettext-tools/default.nix+1−1 pkgs/desktops/deepin/deepin-gtk-theme/default.nix+1−1 pkgs/desktops/deepin/deepin-icon-theme/default.nix+18−8 pkgs/desktops/deepin/deepin-image-viewer/default.nix+6−5 pkgs/desktops/deepin/deepin-menu/default.nix+6−1 pkgs/desktops/deepin/deepin-metacity/default.nix+8−7 pkgs/desktops/deepin/deepin-movie-reborn/default.nix+2−2 pkgs/desktops/deepin/deepin-mutter/default.nix+25−16 pkgs/desktops/deepin/deepin-sound-theme/default.nix+1−1 pkgs/desktops/deepin/deepin-terminal/default.nix+15−10 pkgs/desktops/deepin/deepin-wallpapers/default.nix+6−4 pkgs/desktops/deepin/deepin-wm/default.nix+22−16 pkgs/desktops/deepin/default.nix+4−1 pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix+43 pkgs/desktops/deepin/dtkcore/default.nix+2−2 pkgs/desktops/deepin/dtkwidget/default.nix+2−2 pkgs/desktops/deepin/go-dbus-factory/default.nix+3−3 pkgs/desktops/deepin/go-dbus-generator/default.nix+1−1 pkgs/desktops/deepin/go-gir-generator/default.nix+3−11 pkgs/desktops/deepin/go-lib/default.nix+8−6 pkgs/desktops/deepin/qt5dxcb-plugin/default.nix+2−2 pkgs/desktops/deepin/qt5integration/default.nix+2−2 pkgs/desktops/deepin/setup-hook.sh+53 pkgs/desktops/deepin/update.nix+1−1
pkgs/desktops/deepin/dbus-factory/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 go-dbus-generator
1919 ];
2020
21− makeFlags = [ "GOPATH=$(out)/share/go" ];
21+ makeFlags = [ "GOPATH=${placeholder ''out''}/share/go" ];
2222
2323 postPatch = ''
2424 sed -i -e 's:/share/gocode:/share/go:' Makefile
pkgs/desktops/deepin/dde-api/default.nix+72−24
@@ -1,12 +1,32 @@
11{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
2− deepin-gettext-tools, go-dbus-factory, go-gir-generator, go-lib,
3− alsaLib, glib, gtk3, libcanberra, libgudev, librsvg, poppler,
4− pulseaudio, go, deepin }:
2+ alsaLib,
3+ bc,
4+ blur-effect,
5+ coreutils,
6+ dbus-factory,
7+ deepin,
8+ deepin-gettext-tools,
9+ fontconfig,
10+ glib,
11+ go,
12+ go-dbus-factory,
13+ go-gir-generator,
14+ go-lib,
15+ grub2,
16+ gtk3,
17+ libcanberra,
18+ libgudev,
19+ librsvg,
20+ poppler,
21+ pulseaudio,
22+ rfkill,
23+ xcur2png
24+}:
525
626buildGoPackage rec {
727 name = "${pname}-${version}";
828 pname = "dde-api";
9− version = "3.5.0";
29+ version = "3.18.1";
1030
1131 goPackagePath = "pkg.deepin.io/dde/api";
1232
@@ -14,33 +34,62 @@ buildGoPackage rec {
1434 owner = "linuxdeepin";
1535 repo = pname;
1636 rev = version;
17− sha256 = "1g3s0i5wa6qyv00yksz4r4cy2vhiknq8v0yx7aribvwm3gxf7jw3";
37+ sha256 = "0y8v18f6l3ycysdn4qi7c93z805q7alji8wix4j4qh9x9r35d728";
1838 };
1939
2040 goDeps = ./deps.nix;
2141
42+ outputs = [ "out" ];
43+
2244 nativeBuildInputs = [
2345 pkgconfig
24− deepin-gettext-tools
25− go-dbus-factory
26− go-gir-generator
27− go-lib
46+ deepin-gettext-tools # build
47+ dbus-factory # build
48+ go-dbus-factory # needed
49+ go-gir-generator # needed
50+ go-lib # build
51+ deepin.setupHook
2852 ];
2953
3054 buildInputs = [
31− alsaLib
32− glib
33− gtk3
34− libcanberra
35− libgudev
36− librsvg
37− poppler
38− pulseaudio
39− ];
55+ alsaLib # needed
56+ bc # run (to adjust grub theme?)
57+ blur-effect # run (is it really needed?)
58+ coreutils # run (is it really needed?)
59+ fontconfig # run (is it really needed?)
60+ #glib # ? arch
61+ grub2 # run (is it really needed?)
62+ gtk3 # build run
63+ libcanberra # build run
64+ libgudev # needed
65+ librsvg # build run
66+ poppler # build run
67+ pulseaudio # needed
68+ rfkill # run
69+ xcur2png # run
70+ #locales # run (locale-helper needs locale-gen, which is unavailable on NixOS?)
71+ ];
4072
4173 postPatch = ''
42− patchShebangs .
43− sed -i -e "s|/var|$bin/var|" Makefile
74+ searchHardCodedPaths # debugging
75+
76+ sed -i -e "s|/var|$out/var|" Makefile
77+
78+ # TODO: confirm where to install grub themes
79+ sed -i -e "s|/boot/grub|$out/boot/grub|" Makefile
80+
81+ fixPath $out /usr/lib/deepin-api \
82+ lunar-calendar/main.go \
83+ misc/services/com.deepin.api.CursorHelper.service \
84+ misc/services/com.deepin.api.Graphic.service \
85+ misc/services/com.deepin.api.LunarCalendar.service \
86+ misc/services/com.deepin.api.Pinyin.service \
87+ misc/system-services/com.deepin.api.Device.service \
88+ misc/system-services/com.deepin.api.LocaleHelper.service \
89+ misc/system-services/com.deepin.api.SoundThemePlayer.service \
90+ misc/systemd/system/deepin-shutdown-sound.service \
91+ theme_thumb/gtk/gtk.go \
92+ thumbnails/gtk/gtk.go
4493 '';
4594
4695 buildPhase = ''
@@ -49,10 +98,9 @@ buildGoPackage rec {
4998 '';
5099
51100 installPhase = ''
52− make install PREFIX="$bin" SYSTEMD_LIB_DIR="$bin/lib" -C go/src/${goPackagePath}
53− mkdir -p $out/share
54− mv $bin/share/gocode $out/share/go
55− remove-references-to -t ${go} $bin/bin/* $bin/lib/deepin-api/*
101+ make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath}
102+ mv $out/share/gocode $out/share/go
103+ remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/*
56104 '';
57105
58106 passthru.updateScript = deepin.updateScript { inherit name; };
pkgs/desktops/deepin/dde-api/deps.nix+11−11
@@ -1,4 +1,4 @@
1−# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
1+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
22[
33 {
44 goPackagePath = "github.com/alecthomas/template";
@@ -32,8 +32,8 @@
3232 fetch = {
3333 type = "git";
3434 url = "https://github.com/disintegration/imaging";
35− rev = "9458da53d1e65e098d48467a4317c403327e4424";
36− sha256 = "1b0ma9if8s892qfx5b1vjinxn00ah9vsyxijs8knkilrhf5vqcx4";
35+ rev = "061e8a750a4db9667cdf9e2af7f4029ba506cb3b";
36+ sha256 = "13fkknwz2iby5rdzv9sgam6p27zdgxis3sxgyls9sdir5lbhjhm7";
3737 };
3838 }
3939 {
@@ -41,8 +41,8 @@
4141 fetch = {
4242 type = "git";
4343 url = "https://github.com/fogleman/gg";
44− rev = "0e0ff3ade7039063fe954cc1b45fad6cd4ac80db";
45− sha256 = "06gvsngfwizdxin90nldix5503fqgnwqmqvxzrz0xg5hfazwfra5";
44+ rev = "0403632d5b905943a1c2a5b2763aaecd568467ec";
45+ sha256 = "1nkldjghbqnzj2djfaxhiv35kk341xhcrj9m2dwq65v684iqkk8n";
4646 };
4747 }
4848 {
@@ -59,8 +59,8 @@
5959 fetch = {
6060 type = "git";
6161 url = "https://github.com/linuxdeepin/go-x11-client";
62− rev = "03541136501cab4910ad8852fe749ef8e18907ca";
63− sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp";
62+ rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561";
63+ sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl";
6464 };
6565 }
6666 {
@@ -77,8 +77,8 @@
7777 fetch = {
7878 type = "git";
7979 url = "https://go.googlesource.com/image";
80− rev = "69cc3646b96e61de0b417f4815b86c36e65783ee";
81− sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9";
80+ rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65";
81+ sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3";
8282 };
8383 }
8484 {
@@ -86,8 +86,8 @@
8686 fetch = {
8787 type = "git";
8888 url = "https://go.googlesource.com/net";
89− rev = "c44066c5c816ec500d459a2a324a753f78531ae0";
90− sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f";
89+ rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f";
90+ sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s";
9191 };
9292 }
9393 {
pkgs/desktops/deepin/dde-calendar/default.nix+7−3
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
1919 qmake
2020 qttools
2121 deepin-gettext-tools
22+ deepin.setupHook
2223 ];
2324
2425 buildInputs = [
@@ -27,11 +28,14 @@ stdenv.mkDerivation rec {
2728 ];
2829
2930 postPatch = ''
30− patchShebangs .
31+ searchHardCodedPaths
32+ patchShebangs translate_generation.sh
33+ patchShebangs translate_desktop.sh
34+
35+ fixPath $out /usr com.deepin.Calendar.service
36+
3137 sed -i translate_desktop.sh \
3238 -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert,"
33− sed -i com.deepin.Calendar.service \
34− -e "s,/usr,$out,"
3539 '';
3640
3741 passthru.updateScript = deepin.updateScript { inherit name; };
pkgs/desktops/deepin/dde-daemon/default.nix+39−14
@@ -1,13 +1,15 @@
11{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig,
22 dbus-factory, go-dbus-factory, go-gir-generator, go-lib,
3− deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl,
4− librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3,
5− python3Packages, hicolor-icon-theme, go, deepin }:
3+ deepin-gettext-tools, dde-api, deepin-desktop-schemas,
4+ deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3,
5+ libgudev, libinput, libnl, librsvg, linux-pam, networkmanager,
6+ pulseaudio, xorg, python3, hicolor-icon-theme, glibc, tzdata, go,
7+ deepin, makeWrapper, wrapGAppsHook }:
68
79buildGoPackage rec {
810 name = "${pname}-${version}";
911 pname = "dde-daemon";
10− version = "3.6.0";
12+ version = "3.24.1";
1113
1214 goPackagePath = "pkg.deepin.io/dde/daemon";
1315
@@ -15,15 +17,14 @@ buildGoPackage rec {
1517 owner = "linuxdeepin";
1618 repo = pname;
1719 rev = version;
18− sha256 = "0gn2zp34wg79lvzdfla6yb4gs3f9ll83kj765zvig1wpx51nq1aj";
20+ sha256 = "1qxj0mqnl10qj8qidpc1sv8gm4gj5965i07d003yxlxcw9cqwx7y";
1921 };
2022
2123 patches = [
2224 # https://github.com/linuxdeepin/dde-daemon/issues/51
2325 (fetchpatch {
24− name = "dde-daemon_3.2.3.patch";
25− url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.2.3.patch;
26− sha256 = "0a3xb15czpfl2vajpf7ycw37vr7fbw2png1a67mvjjkgx7d1k7dg";
26+ url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.8.0.patch;
27+ sha256 = "1ampdsp9zlg263flswdw9gj10n7gxh7zi6w6z9jgh29xlai05pvh";
2728 })
2829 ];
2930
@@ -38,46 +39,70 @@ buildGoPackage rec {
3839 go-gir-generator
3940 go-lib
4041 deepin-gettext-tools
41− dde-api
4242 linux-pam
4343 networkmanager
4444 networkmanager.dev
45− python3Packages.python
45+ python3
46+ makeWrapper
47+ wrapGAppsHook
48+ deepin.setupHook
4649 ];
4750
4851 buildInputs = [
4952 alsaLib
53+ dde-api
54+ deepin-desktop-base
55+ deepin-desktop-schemas
56+ deepin-wallpapers
5057 glib
51− gnome3.libgudev
58+ libgudev
5259 gtk3
5360 hicolor-icon-theme
5461 libinput
5562 libnl
5663 librsvg
5764 pulseaudio
65+ tzdata
5866 ];
5967
6068 postPatch = ''
61− patchShebangs .
69+ searchHardCodedPaths
70+ patchShebangs network/nm_generator/gen_nm_consts.py
6271
63− sed -i network/nm_generator/Makefile -e 's,/usr/share/gir-1.0/NM-1.0.gir,${networkmanager.dev}/share/gir-1.0/NM-1.0.gir,'
72+ fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go
73+ fixPath ${networkmanager.dev} /usr/share/gir-1.0/NM-1.0.gir network/nm_generator/Makefile
74+ fixPath ${glibc.bin} /usr/bin/getconf systeminfo/utils.go
75+ fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go
76+ fixPath ${tzdata} /usr/share/zoneinfo timedate/zoneinfo/zone.go
77+ fixPath ${dde-api} /usr/lib/deepin-api grub2/modify_manger.go accounts/image_blur.go
78+ fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go
6479
6580 sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile
6681 sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile
6782 sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile
6883
6984 find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} +
85+
86+ searchHardCodedPaths
7087 '';
7188
7289 buildPhase = ''
73− make -C go/src/${goPackagePath}
7490 # compilation of the nm module is failing
7591 #make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code
92+ make -C go/src/${goPackagePath}
7693 '';
7794
7895 installPhase = ''
7996 make install PREFIX="$out" -C go/src/${goPackagePath}
8097 remove-references-to -t ${go} $out/lib/deepin-daemon/*
98+ searchHardCodedPaths $out
99+ '';
100+
101+ postFixup = ''
102+ # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec
103+ for binary in $out/lib/deepin-daemon/*; do
104+ wrapProgram $binary "''${gappsWrapperArgs[@]}"
105+ done
81106 '';
82107
83108 passthru.updateScript = deepin.updateScript { inherit name; };
pkgs/desktops/deepin/dde-daemon/deps.nix+13−13
@@ -1,4 +1,4 @@
1−# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
1+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
22[
33 {
44 goPackagePath = "github.com/alecthomas/template";
@@ -41,8 +41,8 @@
4141 fetch = {
4242 type = "git";
4343 url = "https://github.com/linuxdeepin/go-x11-client";
44− rev = "03541136501cab4910ad8852fe749ef8e18907ca";
45− sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp";
44+ rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561";
45+ sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl";
4646 };
4747 }
4848 {
@@ -50,8 +50,8 @@
5050 fetch = {
5151 type = "git";
5252 url = "https://github.com/msteinert/pam";
53− rev = "f4cd9f5e29232537a12db1678f48c702ad6896b7";
54− sha256 = "1vjawxswy3f23v4d72kk95y3b557580670ai9ffvrwy6wy85qync";
53+ rev = "f29b9f28d6f9a1f6c4e6fd5db731999eb946574b";
54+ sha256 = "1v5z51mgyz2glm7v0mg60xs1as88wx6cqhys2khc5d3khkr8q0qp";
5555 };
5656 }
5757 {
@@ -68,8 +68,8 @@
6868 fetch = {
6969 type = "git";
7070 url = "https://go.googlesource.com/image";
71− rev = "69cc3646b96e61de0b417f4815b86c36e65783ee";
72− sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9";
71+ rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65";
72+ sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3";
7373 };
7474 }
7575 {
@@ -77,8 +77,8 @@
7777 fetch = {
7878 type = "git";
7979 url = "https://go.googlesource.com/net";
80− rev = "c44066c5c816ec500d459a2a324a753f78531ae0";
81− sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f";
80+ rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f";
81+ sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s";
8282 };
8383 }
8484 {
@@ -86,8 +86,8 @@
8686 fetch = {
8787 type = "git";
8888 url = "https://go.googlesource.com/text";
89− rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2";
90− sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj";
89+ rev = "e3703dcdd614d2d7488fff034c75c551ea25da95";
90+ sha256 = "1xh106aslp04vbzb4hc7cc5fyg2ljwny8fwfwsp5mpbqr9ixkikv";
9191 };
9292 }
9393 {
@@ -104,8 +104,8 @@
104104 fetch = {
105105 type = "git";
106106 url = "https://github.com/linuxdeepin/go-lib.git";
107− rev = "b199d0dc96e979398ea3985334ccf9c20236d1a7";
108− sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv";
107+ rev = "3558b2348565e983c7d4a57a0a21bbe716a55b83";
108+ sha256 = "0p9yrxa3x71n3jxffh03ahjgimdzvxzhny632k363lkha6glvbnc";
109109 };
110110 }
111111]
pkgs/desktops/deepin/dde-polkit-agent/default.nixnew file+51
@@ -0,0 +1,51 @@
1+{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt,
2+ dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }:
3+
4+stdenv.mkDerivation rec {
5+ name = "${pname}-${version}";
6+ pname = "dde-polkit-agent";
7+ version = "0.2.4";
8+
9+ src = fetchFromGitHub {
10+ owner = "linuxdeepin";
11+ repo = pname;
12+ rev = version;
13+ sha256 = "1x7mv63g8412w1bq7fijsdzi8832qjb6gnr1nykcv7imzlycq9m6";
14+ };
15+
16+ nativeBuildInputs = [
17+ pkgconfig
18+ qmake
19+ qttools
20+ deepin.setupHook
21+ ];
22+
23+ buildInputs = [
24+ dde-qt-dbus-factory
25+ dtkcore
26+ dtkwidget
27+ polkit-qt
28+ ];
29+
30+ postPatch = ''
31+ searchHardCodedPaths
32+ patchShebangs translate_generation.sh
33+
34+ fixPath $out /usr dde-polkit-agent.pro polkit-dde-authentication-agent-1.desktop
35+ fixPath /run/current-system/sw /usr/lib/polkit-1-dde/plugins pluginmanager.cpp
36+ '';
37+
38+ postFixup = ''
39+ searchHardCodedPaths $out
40+ '';
41+
42+ passthru.updateScript = deepin.updateScript { inherit name; };
43+
44+ meta = with stdenv.lib; {
45+ description = "PolicyKit agent for Deepin Desktop Environment";
46+ homepage = https://github.com/linuxdeepin/dde-polkit-agent;
47+ license = licenses.gpl3;
48+ platforms = platforms.linux;
49+ maintainers = with maintainers; [ romildo ];
50+ };
51+}
pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix+9−6
@@ -1,25 +1,28 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, qmake, python, deepin }:
1+{ stdenv, fetchFromGitHub, pkgconfig, qmake, python3, deepin }:
22
33stdenv.mkDerivation rec {
44 name = "${pname}-${version}";
55 pname = "dde-qt-dbus-factory";
6− version = "1.0.5";
6+ version = "1.1.1";
77
88 src = fetchFromGitHub {
99 owner = "linuxdeepin";
1010 repo = pname;
1111 rev = version;
12− sha256 = "0cz55hsbhy1ab1mndv0sp6xnqrhz2y66w7pcxy8v9k87ii32czf8";
12+ sha256 = "1b2i5m6fzkga72hbl85v2rng3qq53di39p7jj2f119wmlfbyp2vg";
1313 };
1414
1515 nativeBuildInputs = [
1616 qmake
17− python
17+ python3
18+ deepin.setupHook
1819 ];
1920
2021 postPatch = ''
21− sed -i libdframeworkdbus/{DFrameworkdbusConfig.in,libdframeworkdbus.pro} \
22− -e "s,/usr,$out,"
22+ searchHardCodedPaths
23+ fixPath $out /usr \
24+ libdframeworkdbus/DFrameworkdbusConfig.in \
25+ libdframeworkdbus/libdframeworkdbus.pro
2326 '';
2427
2528 enableParallelBuilding = true;
pkgs/desktops/deepin/dde-session-ui/default.nix+9−4
@@ -1,18 +1,18 @@
11{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtsvg, qttools,
22 qtx11extras, xkeyboard_config, xorg, lightdm_qt, gsettings-qt,
33 dde-qt-dbus-factory, deepin-gettext-tools, dtkcore, dtkwidget,
4− hicolor-icon-theme, deepin }:
4+ deepin-desktop-schemas, deepin, hicolor-icon-theme, wrapGAppsHook }:
55
66stdenv.mkDerivation rec {
77 name = "${pname}-${version}";
88 pname = "dde-session-ui";
9− version = "4.6.2";
9+ version = "4.9.0";
1010
1111 src = fetchFromGitHub {
1212 owner = "linuxdeepin";
1313 repo = pname;
1414 rev = version;
15− sha256 = "1fxlrj7vv7nqllwpwc8mxiv9bfqcj9b2qwkpjaq326pfmg5p5lhq";
15+ sha256 = "1bh7wbkzikcnka94nzqzl87cs2m6bslrv9r2hdsvqqr3aaad5za3";
1616 };
1717
1818 nativeBuildInputs = [
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
2020 qmake
2121 qttools
2222 deepin-gettext-tools
23+ wrapGAppsHook
24+ deepin.setupHook
2325 ];
2426
2527 buildInputs = [
@@ -35,10 +37,13 @@ stdenv.mkDerivation rec {
3537 xorg.libXtst
3638 xkeyboard_config
3739 hicolor-icon-theme
40+ deepin-desktop-schemas
3841 ];
3942
4043 postPatch = ''
41− patchShebangs .
44+ searchHardCodedPaths
45+ patchShebangs translate_generation.sh
46+ patchShebangs translate_desktop.sh
4247 sed -i translate_desktop.sh -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert,"
4348 find -type f -exec sed -i -e "s,path = /etc,path = $out/etc," {} +
4449 find -type f -exec sed -i -e "s,path = /usr,path = $out," {} +
pkgs/desktops/deepin/deepin-desktop-base/default.nix+27−13
@@ -3,34 +3,40 @@
33stdenv.mkDerivation rec {
44 name = "${pname}-${version}";
55 pname = "deepin-desktop-base";
6− version = "2018.10.29";
6+ version = "2019.03.29";
77
88 src = fetchFromGitHub {
99 owner = "linuxdeepin";
1010 repo = pname;
1111 rev = version;
12− sha256 = "0l2zb7rpag2q36lqsgvirhjgmj7w243nsi1rywkypf2xm7g2v235";
12+ sha256 = "1d016h95nsn5yay9f4c13hixfxj0q01hpxwj2x84i6qpx63dxdwq";
1313 };
1414
15+ nativeBuildInputs = [ deepin.setupHook ];
16+
1517 buildInputs = [ deepin-wallpapers ];
1618
19+ # TODO: Fedora recommended dependencies:
20+ # deepin-wallpapers
21+ # plymouth-theme-deepin
22+
1723 postPatch = ''
18− sed -i Makefile -e "s:/usr:$out:" -e "s:/etc:$out/etc:"
19− '';
24+ searchHardCodedPaths
2025
21− postInstall = ''
22− # Remove Deepin distro's lsb-release
23− rm $out/etc/lsb-release
26+ fixPath $out /etc Makefile
27+ fixPath $out /usr Makefile
2428
29+ # Remove Deepin distro's lsb-release
2530 # Don't override systemd timeouts
26− rm -r $out/etc/systemd
27−
2831 # Remove apt-specific templates
29− rm -r $out/share/python-apt
30−
31− # Remove empty backgrounds directory
32− rm -r $out/share/backgrounds
32+ echo ----------------------------------------------------------------
33+ echo grep --color=always -E 'lsb-release|systemd|python-apt|backgrounds' Makefile
34+ grep --color=always -E 'lsb-release|systemd|python-apt|backgrounds' Makefile
35+ echo ----------------------------------------------------------------
36+ sed -i -E '/lsb-release|systemd|python-apt|backgrounds/d' Makefile
37+ '';
3338
39+ postInstall = ''
3440 # Make a symlink for deepin-version
3541 ln -s ../lib/deepin/desktop-version $out/etc/deepin-version
3642 '';
@@ -39,6 +45,14 @@ stdenv.mkDerivation rec {
3945
4046 meta = with stdenv.lib; {
4147 description = "Base assets and definitions for Deepin Desktop Environment";
48+ # TODO: revise
49+ longDescription = ''
50+ This package provides some components for Deepin desktop environment.
51+ - deepin logo
52+ - deepin desktop version
53+ - login screen background image
54+ - language information
55+ '';
4256 homepage = https://github.com/linuxdeepin/deepin-desktop-base;
4357 license = licenses.gpl3;
4458 platforms = platforms.linux;
pkgs/desktops/deepin/deepin-desktop-schemas/default.nix+31−8
@@ -1,21 +1,22 @@
1−{ stdenv, fetchFromGitHub, python, deepin-gtk-theme,
2− deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, gnome3,
3− deepin }:
1+{ stdenv, fetchFromGitHub, python3, gnome3, glib, deepin-gtk-theme,
2+ deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }:
43
54stdenv.mkDerivation rec {
65 name = "${pname}-${version}";
76 pname = "deepin-desktop-schemas";
8− version = "3.4.0";
7+ version = "3.13.0";
98
109 src = fetchFromGitHub {
1110 owner = "linuxdeepin";
1211 repo = pname;
1312 rev = version;
14− sha256 = "10x0rh9z925yzyp8h0vgmg4313smvran06lvr12c3931qkmkzwgq";
13+ sha256 = "0bamjcpmsl8xhw3ksgl11wv5xwcdhrkl1namikfzc4an03sk1rdq";
1514 };
1615
1716 nativeBuildInputs = [
18− python
17+ python3
18+ glib.dev
19+ deepin.setupHook
1920 ];
2021
2122 buildInputs = [
@@ -27,12 +28,34 @@ stdenv.mkDerivation rec {
2728 ];
2829
2930 postPatch = ''
31+ searchHardCodedPaths
32+
3033 # fix default background url
31− sed -i '/picture-uri/s|/usr/share/backgrounds/default_background.jpg|$out/share/backgrounds/deepin/default.png|' \
34+ sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \
35+ overrides/common/com.deepin.wrap.gnome.desktop.override
36+
37+ fixPath ${deepin-wallpapers} /usr/share/backgrounds \
3238 overrides/common/com.deepin.wrap.gnome.desktop.override
39+
40+ fixPath ${deepin-wallpapers} /usr/share/wallpapers/deepin \
41+ schemas/com.deepin.dde.appearance.gschema.xml
42+
43+ # still hardcoded paths:
44+ # /etc/gnome-settings-daemon/xrandr/monitors.xml ? gnome3.gnome-settings-daemon
45+ # /usr/share/backgrounds/gnome/adwaita-lock.jpg ? gnome3.gnome-backgrounds
46+ # /usr/share/backgrounds/gnome/adwaita-timed.xml gnome3.gnome-backgrounds
47+ # /usr/share/desktop-directories
3348 '';
3449
35− makeFlags = [ "PREFIX=$(out)" ];
50+ makeFlags = [ "PREFIX=${placeholder ''out''}" ];
51+
52+ doCheck = true;
53+ checkTarget = "test";
54+
55+ postInstall = ''
56+ glib-compile-schemas --strict $out/share/glib-2.0/schemas
57+ searchHardCodedPaths $out
58+ '';
3659
3760 passthru.updateScript = deepin.updateScript { inherit name; };
3861
pkgs/desktops/deepin/deepin-gettext-tools/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 python3Packages.python
2525 ];
2626
27− makeFlags = [ "PREFIX=$(out)" ];
27+ makeFlags = [ "PREFIX=${placeholder ''out''}" ];
2828
2929 postPatch = ''
3030 sed -e 's/sudo cp/cp/' -i src/generate_mo.py
pkgs/desktops/deepin/deepin-gtk-theme/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 propagatedUserEnvPkgs = [ gtk-engine-murrine ];
1616
17− makeFlags = [ "PREFIX=$(out)" ];
17+ makeFlags = [ "PREFIX=${placeholder ''out''}" ];
1818
1919 passthru.updateScript = deepin.updateScript { inherit name; };
2020
pkgs/desktops/deepin/deepin-icon-theme/default.nix+18−8
@@ -1,29 +1,39 @@
1−{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme, deepin }:
1+{ stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin }:
22
33stdenv.mkDerivation rec {
44 name = "${pname}-${version}";
55 pname = "deepin-icon-theme";
6− version = "15.12.64";
6+ version = "15.12.68";
77
88 src = fetchFromGitHub {
99 owner = "linuxdeepin";
1010 repo = pname;
1111 rev = version;
12− sha256 = "0z1yrp6yg2hb67azrbd9ac743jjh83vxdf2j0mmv2lfpd4fqw8qc";
12+ sha256 = "12jgz81s5qggmnkfg9m5f799r10p43qmh4zqxl1kjvlrqgvsc9rf";
1313 };
1414
15− nativeBuildInputs = [ gtk3 papirus-icon-theme ];
15+ nativeBuildInputs = [ gtk3 xcursorgen ];
1616
17− postPatch = ''
18− patchShebangs .
17+ buildInputs = [ papirus-icon-theme ];
1918
20− # install in $out
21− sed -i -e "s|/usr|$out|g" Makefile tools/hicolor.links
19+ postPatch = ''
20+ patchShebangs tools/hicolor.links
21+ patchShebangs tools/display_unused_links.sh
22+ patchShebangs cursors-src/cursors/bitmaps/make.sh
23+ patchShebangs cursors-src/render-cursors.sh
2224
2325 # keep icon-theme.cache
2426 sed -i -e 's|\(-rm -f .*/icon-theme.cache\)|# \1|g' Makefile
2527 '';
2628
29+ buildTargets = "all hicolor-links";
30+ installTargets = "install-icons install-cursors";
31+ installFlags = [ "PREFIX=${placeholder ''out''}" ];
32+
33+ postInstall = ''
34+ cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/
35+ '';
36+
2737 passthru.updateScript = deepin.updateScript { inherit name; };
2838
2939 meta = with stdenv.lib; {
pkgs/desktops/deepin/deepin-image-viewer/default.nix+6−5
@@ -6,19 +6,20 @@
66stdenv.mkDerivation rec {
77 name = "${pname}-${version}";
88 pname = "deepin-image-viewer";
9− version = "1.3.1";
9+ version = "1.3.10";
1010
1111 src = fetchFromGitHub {
1212 owner = "linuxdeepin";
1313 repo = pname;
1414 rev = version;
15− sha256 = "0dxdvm6hzj6izfxka35za8y7vacd06nksfgzx6xsv7ywzagri4k5";
15+ sha256 = "0paanw9sd67ic9yrbzqhrwi4bf4lpvsk16jynx99n76j3jgyijkk";
1616 };
1717
1818 nativeBuildInputs = [
1919 pkgconfig
2020 qmake
2121 qttools
22+ deepin.setupHook
2223 ];
2324
2425 buildInputs = [
@@ -33,12 +34,12 @@ stdenv.mkDerivation rec {
3334 ];
3435
3536 postPatch = ''
36− patchShebangs .
37+ searchHardCodedPaths
38+ patchShebangs viewer/generate_translations.sh
39+ fixPath $out /usr viewer/com.deepin.ImageViewer.service
3740 sed -i qimage-plugins/freeimage/freeimage.pro \
3841 qimage-plugins/libraw/libraw.pro \
3942 -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix,"
40− sed -i viewer/com.deepin.ImageViewer.service \
41− -e "s,/usr,$out,"
4243 '';
4344
4445 passthru.updateScript = deepin.updateScript { inherit name; };
pkgs/desktops/deepin/deepin-menu/default.nix+6−1
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
1616 nativeBuildInputs = [
1717 pkgconfig
1818 qmake
19+ deepin.setupHook
1920 ];
2021
2122 buildInputs = [
@@ -25,7 +26,11 @@ stdenv.mkDerivation rec {
2526 ];
2627
2728 postPatch = ''
28− sed -i deepin-menu.pro -e "s,/usr,$out,"
29+ searchHardCodedPaths
30+ fixPath $out /usr \
31+ data/com.deepin.menu.service \
32+ deepin-menu.desktop \
33+ deepin-menu.pro
2934 '';
3035
3136 enableParallelBuilding = true;
pkgs/desktops/deepin/deepin-metacity/default.nix+8−7
@@ -1,25 +1,26 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, libgtop, bamf,
2− json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification,
3− deepin-wallpapers, deepin-desktop-schemas, deepin }:
1+{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, glib,
2+ gtk3, libgtop, bamf, json-glib, libcanberra-gtk3, libxkbcommon,
3+ libstartup_notification, deepin-wallpapers, deepin-desktop-schemas,
4+ deepin }:
45
56stdenv.mkDerivation rec {
67 name = "${pname}-${version}";
78 pname = "deepin-metacity";
8− version = "3.22.22";
9+ version = "3.22.24";
910
1011 src = fetchFromGitHub {
1112 owner = "linuxdeepin";
1213 repo = pname;
1314 rev = version;
14− sha256 = "0gr10dv8vphla6z7zqiyyg3n3ag4rrlz43c4kr7fd5xwx2bfvp3d";
15+ sha256 = "1im0wz1zlxiag4kpp5d4hv0aa0ybr4bizarr3903hrqv0lp46hyx";
1516 };
1617
1718 nativeBuildInputs = [
1819 pkgconfig
1920 intltool
2021 libtool
22+ glib.dev
2123 gnome3.gnome-common
22− gnome3.glib.dev
2324 ];
2425
2526 buildInputs = [
@@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
4142 -e 's;/usr/share/backgrounds/default_background.jpg;${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg;'
4243 '';
4344
44− NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
45+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
4546
4647 configureFlags = [ "--disable-themes-documentation" ];
4748
pkgs/desktops/deepin/deepin-movie-reborn/default.nix+2−2
@@ -5,13 +5,13 @@
55stdenv.mkDerivation rec {
66 name = "${pname}-${version}";
77 pname = "deepin-movie-reborn";
8− version = "3.2.14";
8+ version = "3.2.21";
99
1010 src = fetchFromGitHub {
1111 owner = "linuxdeepin";
1212 repo = pname;
1313 rev = version;
14− sha256 = "1i9sdg2p6qp57rqzrnjbxnqj3mg1qggzyq3yykw271vs8h85a707";
14+ sha256 = "09a4sirbdxnrwj9ww2v7b1s9ylsincqzpqm2zisny9zxy22fm8s9";
1515 };
1616
1717 nativeBuildInputs = [
pkgs/desktops/deepin/deepin-mutter/default.nix+25−16
@@ -1,17 +1,19 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, xorg,
2− libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon,
3− libstartup_notification, libinput, cogl, clutter, systemd, deepin }:
1+{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3,
2+ xorg, libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon,
3+ libstartup_notification, libinput, libgudev, cogl, clutter, systemd,
4+ gsettings-desktop-schemas, deepin-desktop-schemas, wrapGAppsHook,
5+ deepin }:
46
57stdenv.mkDerivation rec {
68 name = "${pname}-${version}";
79 pname = "deepin-mutter";
8− version = "3.20.35";
10+ version = "3.20.38";
911
1012 src = fetchFromGitHub {
1113 owner = "linuxdeepin";
1214 repo = pname;
1315 rev = version;
14− sha256 = "0mwk06kgw8qp8rg1j6px1zlya4x5rr9llax0qks59j56b3m9yim7";
16+ sha256 = "1aq7606sgn2c6n8wfgxdryw3lprc4va0zjc0r65798w5656fdi31";
1517 };
1618
1719 nativeBuildInputs = [
@@ -19,27 +21,32 @@ stdenv.mkDerivation rec {
1921 intltool
2022 libtool
2123 gnome3.gnome-common
24+ wrapGAppsHook
25+ deepin.setupHook
2226 ];
2327
2428 buildInputs = [
25− gtk3
29+ clutter
30+ cogl
31+ deepin-desktop-schemas
2632 gnome3.gnome-desktop
27− gnome3.gsettings-desktop-schemas
28− gnome3.libgudev
2933 gnome3.zenity
30− upower
31− xorg.libxkbfile
32− libxkbcommon
34+ gsettings-desktop-schemas
35+ gtk3
3336 libcanberra-gtk3
34− libstartup_notification
37+ libgudev
3538 libinput
36− xkeyboard_config
37− cogl
38− clutter
39+ libstartup_notification
40+ libxkbcommon
3941 systemd
42+ upower
43+ xkeyboard_config
44+ xorg.libxkbfile
4045 ];
4146
42− enableParallelBuilding = true;
47+ postPatch = ''
48+ searchHardCodedPaths
49+ '';
4350
4451 configureFlags = [
4552 "--enable-native-backend"
@@ -50,6 +57,8 @@ stdenv.mkDerivation rec {
5057 NOCONFIGURE=1 ./autogen.sh
5158 '';
5259
60+ enableParallelBuilding = true;
61+
5362 passthru.updateScript = deepin.updateScript { inherit name; };
5463
5564 meta = with stdenv.lib; {
pkgs/desktops/deepin/deepin-sound-theme/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9";
1313 };
1414
15− makeFlags = [ "PREFIX=$(out)" ];
15+ makeFlags = [ "PREFIX=${placeholder ''out''}" ];
1616
1717 passthru.updateScript = deepin.updateScript { inherit name; };
1818
pkgs/desktops/deepin/deepin-terminal/default.nix+15−10
@@ -1,19 +1,19 @@
11{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, ninja, vala,
2− gettext, gobject-introspection, at-spi2-core, dbus, epoxy, expect,
3− gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg,
4− libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck,
5− deepin-menu, deepin-shortcut-viewer, deepin }:
2+ gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib,
3+ libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1,
4+ libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux,
5+ libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin }:
66
77stdenv.mkDerivation rec {
88 name = "${pname}-${version}";
99 pname = "deepin-terminal";
10− version = "3.0.10.2";
10+ version = "3.2.1.2";
1111
1212 src = fetchFromGitHub {
1313 owner = "linuxdeepin";
1414 repo = "deepin-terminal";
1515 rev = version;
16− sha256 = "0ylhp8q9kfdq9l69drawjaf0q8vcqyflb2a3zfnwbnf06dlpvkz6";
16+ sha256 = "0dj386csbiw0yqz9nj6ij0s4d0ak9lpq2bmsfs17bjkgdp0ayp90";
1717 };
1818
1919 nativeBuildInputs = [
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
2222 ninja
2323 vala
2424 gettext
25− gobject-introspection # For setup hook
25+ libselinux libsepol utillinux # required by gio
26+ deepin.setupHook
2627 ];
2728
2829 buildInputs = [
@@ -49,15 +50,19 @@ stdenv.mkDerivation rec {
4950 ];
5051
5152 postPatch = ''
52− patchShebangs .
53+ searchHardCodedPaths
5354 '';
5455
55− enableParallelBuilding = true;
56+ cmakeFlags = [
57+ "-DTEST_BUILD=OFF"
58+ "-DUSE_VENDOR_LIB=OFF"
59+ "-DVERSION=${version}"
60+ ];
5661
5762 passthru.updateScript = deepin.updateScript { inherit name; };
5863
5964 meta = with stdenv.lib; {
60− description = "The default terminal emulation for Deepin";
65+ description = "Default terminal emulator for Deepin";
6166 longDescription = ''
6267 Deepin terminal, it sharpens your focus in the world of command line!
6368 It is an advanced terminal emulator with workspace, multiple
pkgs/desktops/deepin/deepin-wallpapers/default.nix+6−4
@@ -3,19 +3,21 @@
33stdenv.mkDerivation rec {
44 name = "${pname}-${version}";
55 pname = "deepin-wallpapers";
6− version = "1.7.5";
6+ version = "1.7.7";
77
88 src = fetchFromGitHub {
99 owner = "linuxdeepin";
1010 repo = "deepin-wallpapers";
1111 rev = version;
12− sha256 = "0mfjkh81ci0gjwmgycrh32by7v9b73nyvyjbqd29ccpb8bpyyakn";
12+ sha256 = "09cfnxbpms98ibqbi4xd51181q3az5n8rmndcdr9w12kyzniz7xv";
1313 };
1414
15− nativeBuildInputs = [ dde-api.bin ];
15+ nativeBuildInputs = [ dde-api deepin.setupHook ];
1616
1717 postPatch = ''
18− sed -i -e "s:/usr/lib/deepin-api:${dde-api.bin}/lib/deepin-api:" Makefile
18+ searchHardCodedPaths # debugging
19+
20+ sed -i -e "s:/usr/lib/deepin-api:${dde-api}/lib/deepin-api:" Makefile
1921 sed -i -e "s:/usr/share/wallpapers:$out/share/wallpapers:" Makefile
2022 '';
2123
pkgs/desktops/deepin/deepin-wm/default.nix+22−16
@@ -1,49 +1,55 @@
11{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3,
2− bamf, clutter-gtk, pantheon, libcanberra-gtk3, libwnck3,
3− deepin-mutter, deepin-wallpapers, deepin-desktop-schemas,
4− hicolor-icon-theme, deepin }:
2+ bamf, clutter-gtk, pantheon, libgee, libcanberra-gtk3, libwnck3,
3+ deepin-menu, deepin-mutter, deepin-wallpapers,
4+ deepin-desktop-schemas, wrapGAppsHook, deepin }:
55
66stdenv.mkDerivation rec {
77 name = "${pname}-${version}";
88 pname = "deepin-wm";
9− version = "1.9.34";
9+ version = "1.9.37";
1010
1111 src = fetchFromGitHub {
1212 owner = "linuxdeepin";
1313 repo = pname;
1414 rev = version;
15− sha256 = "13hydcalifdc6723k8l4pk905y9sxic5x1fqww0fyx7j6b3hm13f";
15+ sha256 = "1xd2x0kyav2cxnk0bybl7lrmak1r2468slxz5a6anrdriw9l10gi";
1616 };
1717
1818 nativeBuildInputs = [
1919 pkgconfig
2020 intltool
2121 libtool
22− gnome3.gnome-common
2322 vala
23+ gnome3.gnome-common
24+ wrapGAppsHook
25+ deepin.setupHook
2426 ];
2527
2628 buildInputs = [
27− gnome3.gnome-desktop
28− gnome3.libgee
2929 bamf
3030 clutter-gtk
31− pantheon.granite
32− libcanberra-gtk3
33− libwnck3
31+ deepin-desktop-schemas
32+ deepin-menu
3433 deepin-mutter
3534 deepin-wallpapers
36− deepin-desktop-schemas
37− hicolor-icon-theme
35+ gnome3.gnome-desktop
36+ libcanberra-gtk3
37+ libgee
38+ libwnck3
39+ pantheon.granite
3840 ];
3941
4042 postPatch = ''
41− sed -i src/Background/BackgroundSource.vala \
42− -e 's;/usr/share/backgrounds/default_background.jpg;${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg;'
43+ searchHardCodedPaths
44+ fixPath ${deepin-wallpapers} /usr/share/backgrounds src/Background/BackgroundSource.vala
45+ # fix background path
46+ sed -i 's|default_background.jpg|deepin/desktop.jpg|' src/Background/BackgroundSource.vala
4347 '';
4448
49+ NIX_CFLAGS_COMPILE = "-DWNCK_I_KNOW_THIS_IS_UNSTABLE";
50+
4551 preConfigure = ''
46− ./autogen.sh
52+ NOCONFIGURE=1 ./autogen.sh
4753 '';
4854
4955 enableParallelBuilding = true;
pkgs/desktops/deepin/default.nix+4−1
@@ -2,6 +2,8 @@
22
33let
44 packages = self: with self; {
5+ setupHook = ./setup-hook.sh;
6+
57 updateScript = callPackage ./update.nix { };
68
79 dbus-factory = callPackage ./dbus-factory { };
@@ -14,6 +16,7 @@ let
1416 # XXX: the build is finding references to Go when compiled with go v1.12
1517 go = go_1_11;
1618 };
19+ dde-polkit-agent = callPackage ./dde-polkit-agent { };
1720 dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
1821 dde-session-ui = callPackage ./dde-session-ui { };
1922 deepin-desktop-base = callPackage ./deepin-desktop-base { };
@@ -29,11 +32,11 @@ let
2932 deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { };
3033 deepin-sound-theme = callPackage ./deepin-sound-theme { };
3134 deepin-terminal = callPackage ./deepin-terminal {
32− inherit (pkgs.gnome3) libgee;
3335 wnck = pkgs.libwnck3;
3436 };
3537 deepin-wallpapers = callPackage ./deepin-wallpapers { };
3638 deepin-wm = callPackage ./deepin-wm { };
39+ dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { };
3740 dtkcore = callPackage ./dtkcore { };
3841 dtkwm = callPackage ./dtkwm { };
3942 dtkwidget = callPackage ./dtkwidget { };
pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nixnew file+43
@@ -0,0 +1,43 @@
1+{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, gnome3,
2+ dde-polkit-agent, deepin }:
3+
4+stdenv.mkDerivation rec {
5+ name = "${pname}-${version}";
6+ pname = "dpa-ext-gnomekeyring";
7+ version = "0.1.0";
8+
9+ src = fetchFromGitHub {
10+ owner = "linuxdeepin";
11+ repo = pname;
12+ rev = version;
13+ sha256 = "168j42nwyw7vcgwc0fha2pjpwwlgir70fq1hns4ia1dkdqa1nhzw";
14+ };
15+
16+ nativeBuildInputs = [
17+ pkgconfig
18+ qmake
19+ qttools
20+ deepin.setupHook
21+ ];
22+
23+ buildInputs = [
24+ dde-polkit-agent
25+ gnome3.libgnome-keyring
26+ ];
27+
28+ postPatch = ''
29+ searchHardCodedPaths
30+ patchShebangs translate_generation.sh
31+ fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp
32+ '';
33+
34+ passthru.updateScript = deepin.updateScript { inherit name; };
35+
36+ meta = with stdenv.lib; {
37+ description = "GNOME keyring extension for dde-polkit-agent";
38+ homepage = https://github.com/linuxdeepin/dpa-ext-gnomekeyring;
39+ license = licenses.gpl3;
40+ platforms = platforms.linux;
41+ maintainers = with maintainers; [ romildo ];
42+ };
43+}
pkgs/desktops/deepin/dtkcore/default.nix+2−2
@@ -3,13 +3,13 @@
33stdenv.mkDerivation rec {
44 name = "${pname}-${version}";
55 pname = "dtkcore";
6− version = "2.0.9.8";
6+ version = "2.0.10";
77
88 src = fetchFromGitHub {
99 owner = "linuxdeepin";
1010 repo = pname;
1111 rev = version;
12− sha256 = "06jj5gpy2qbmc21nf0fnbvgw7nbjjgvzx7m2vg9byw5il8l4g22h";
12+ sha256 = "0dwpq6c38gaa95mgjnwj3vjz57n0cz6jfk950xi6s9ww2f4g6kq7";
1313 };
1414
1515 nativeBuildInputs = [
pkgs/desktops/deepin/dtkwidget/default.nix+2−2
@@ -5,13 +5,13 @@
55stdenv.mkDerivation rec {
66 name = "${pname}-${version}";
77 pname = "dtkwidget";
8− version = "2.0.9.10";
8+ version = "2.0.10";
99
1010 src = fetchFromGitHub {
1111 owner = "linuxdeepin";
1212 repo = pname;
1313 rev = version;
14− sha256 = "0757dzy82bfv97b1gzkwa9zx3jzfbap20v3r1h7lkfcfw95410iw";
14+ sha256 = "11a7yirfkcj3rq7va9av4m1pr22mq1yx1j9k18xrqv36n0rlbrr6";
1515 };
1616
1717 nativeBuildInputs = [
pkgs/desktops/deepin/go-dbus-factory/default.nix+3−3
@@ -3,16 +3,16 @@
33stdenv.mkDerivation rec {
44 name = "${pname}-${version}";
55 pname = "go-dbus-factory";
6− version = "0.0.7.1";
6+ version = "0.4.0";
77
88 src = fetchFromGitHub {
99 owner = "linuxdeepin";
1010 repo = pname;
1111 rev = version;
12− sha256 = "0gj2xxv45gh7wr5ry3mcsi46kdsyq9nbd7znssn34kapiv40ixcx";
12+ sha256 = "1i1ymi2qpcbf4d6rnfzrbq5n2vwnn8dvbq9xlw7jls3jpr3d5r00";
1313 };
1414
15− makeFlags = [ "PREFIX=$(out)" ];
15+ makeFlags = [ "PREFIX=${placeholder ''out''}" ];
1616
1717 postPatch = ''
1818 sed -i -e 's:/share/gocode:/share/go:' Makefile
pkgs/desktops/deepin/go-dbus-generator/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 ];
1919
2020 makeFlags = [
21− "PREFIX=$(out)"
21+ "PREFIX=${placeholder ''out''}"
2222 "GOCACHE=$(TMPDIR)/go-cache"
2323 ];
2424
pkgs/desktops/deepin/go-gir-generator/default.nix+3−11
@@ -4,23 +4,15 @@
44stdenv.mkDerivation rec {
55 name = "${pname}-${version}";
66 pname = "go-gir-generator";
7− version = "1.1.0";
7+ version = "2.0.0";
88
99 src = fetchFromGitHub {
1010 owner = "linuxdeepin";
1111 repo = pname;
1212 rev = version;
13− sha256 = "0grp4ffy3vmlknzmymnxq1spwshff2ylqsw82pj4y2v2fcvnqfvb";
13+ sha256 = "0d93qzp3dlia5d1yxw0rwca76qk3jyamj9xzmk13vzig8zw0jx16";
1414 };
1515
16− patches = [
17− # fix: dde-api build error with gobject-introspection 1.58+
18− (fetchurl {
19− url = https://github.com/linuxdeepin/go-gir-generator/commit/a7ab229201e28d1be727f5021b3588fa4a1acf5f.patch;
20− sha256 = "13ywalwkjg8wwvd0pvmc2rv1h38airyvimdn9jfb5wis9xm48401";
21− })
22− ];
23−
2416 nativeBuildInputs = [
2517 pkgconfig
2618 go
@@ -36,7 +28,7 @@ stdenv.mkDerivation rec {
3628 '';
3729
3830 makeFlags = [
39− "PREFIX=$(out)"
31+ "PREFIX=${placeholder ''out''}"
4032 "GOCACHE=$(TMPDIR)/go-cache"
4133 ];
4234
pkgs/desktops/deepin/go-lib/default.nix+8−6
@@ -4,13 +4,13 @@
44stdenv.mkDerivation rec {
55 name = "${pname}-${version}";
66 pname = "go-lib";
7− version = "1.3.0";
7+ version = "1.10.0";
88
99 src = fetchFromGitHub {
1010 owner = "linuxdeepin";
1111 repo = pname;
1212 rev = version;
13− sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv";
13+ sha256 = "090l33y79gdj2xy1bhk2ksl6hvmsfhmx0bhygm4y4d0iqckf2x2m";
1414 };
1515
1616 buildInputs = [
@@ -21,10 +21,12 @@ stdenv.mkDerivation rec {
2121 mobile-broadband-provider-info
2222 ];
2323
24− makeFlags = [
25− "PREFIX=$(out)"
26− "GOSITE_DIR=$(out)/share/go"
27− ];
24+ installPhase = ''
25+ mkdir -p $out/share/go/src/pkg.deepin.io/lib
26+ cp -a * $out/share/go/src/pkg.deepin.io/lib
27+
28+ rm -r $out/share/go/src/pkg.deepin.io/lib/debian
29+ '';
2830
2931 passthru.updateScript = deepin.updateScript { inherit name; };
3032
pkgs/desktops/deepin/qt5dxcb-plugin/default.nix+2−2
@@ -4,13 +4,13 @@
44stdenv.mkDerivation rec {
55 name = "${pname}-${version}";
66 pname = "qt5dxcb-plugin";
7− version = "1.1.13";
7+ version = "1.1.25";
88
99 src = fetchFromGitHub {
1010 owner = "linuxdeepin";
1111 repo = pname;
1212 rev = version;
13− sha256 = "12lvh3agw3qdviqf32brmzba5kscnj5al5jhc08lq69a9kmip05x";
13+ sha256 = "1nadmj1hdpw4n3kpk3dlx22bmxdli66abhjl73hwrbvszmmcm9vp";
1414 };
1515
1616 nativeBuildInputs = [
pkgs/desktops/deepin/qt5integration/default.nix+2−2
@@ -5,13 +5,13 @@
55stdenv.mkDerivation rec {
66 name = "${pname}-${version}";
77 pname = "qt5integration";
8− version = "0.3.6";
8+ version = "0.3.8";
99
1010 src = fetchFromGitHub {
1111 owner = "linuxdeepin";
1212 repo = pname;
1313 rev = version;
14− sha256 = "1v9whlqn07c5c8xnaiicdshj9n88a667gfbn8y8bk5bfylilfzcy";
14+ sha256 = "12d6iv2x0q2n73rscma30q31nh7h26gmhlf665gkgl2j825hlx5n";
1515 };
1616
1717 nativeBuildInputs = [
pkgs/desktops/deepin/setup-hook.shnew file+53
@@ -0,0 +1,53 @@
1+# Helper functions for deepin packaging
2+
3+searchHardCodedPaths() {
4+ # looks for ocurrences of hard coded paths in given (current)
5+ # directory and command invocations for the purpose of debugging a
6+ # derivation
7+
8+ local dir=$1
9+
10+ echo ----------- looking for command invocations
11+ grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $dir || true
12+
13+ echo ----------- looking for hard coded paths
14+ grep --color=always -r -E '/(usr|bin|sbin|etc|var|opt)\>' $dir || true
15+
16+ echo ----------- done
17+}
18+
19+fixPath() {
20+ # Usage:
21+ #
22+ # fixPath <parent dir> <path> <files>
23+ #
24+ # replaces occurences of <path> by <parent_dir><path> in <files>
25+ # removing /usr from the start of <path> if present
26+
27+ local parentdir=$1
28+ local path=$2
29+ local newpath=$parentdir$(echo $path | sed "s,^/usr,,")
30+ local files=("${@:3}")
31+ echo ======= grep --color=always "${path}" "${files[@]}"
32+ grep --color=always "${path}" "${files[@]}"
33+ echo +++++++ sed -i -e "s,$path,$newpath,g" "${files[@]}"
34+ sed -i -e "s,$path,$newpath,g" "${files[@]}"
35+}
36+
37+searchForUnresolvedDLL() {
38+ # Usage:
39+ #
40+ # searchForUnresolvedDLL <dir>
41+ #
42+ # looks in <dir> for executables with unresolved dynamic library paths
43+
44+ local dir="$1"
45+ echo ======= Looking for executables with unresolved dynamic library dependencies
46+ echo $dir
47+ for f in $(find -L "$dir" -type f -executable); do
48+ if (ldd $f | grep -q "not found"); then
49+ echo $f
50+ ldd $f | grep --color=always "not found"
51+ fi
52+ done
53+}
pkgs/desktops/deepin/update.nix+1−1
@@ -1,5 +1,5 @@
11{ stdenv, lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }:
2−{ name, ignored-versions ? "^2014\\.|^v[0-9]+" }:
2+{ name, ignored-versions ? "^2014(\\.|rc)|^v[0-9]+" }:
33
44let
55 nameAndVersion = builtins.parseDrvName name;