Merge pull request #58988 from worldofpeace/deepin-backport

+1 -1

pkgs/desktops/deepin/dbus-factory/default.nix

··· 18 18 go-dbus-generator 19 19 ]; 20 20 21 - makeFlags = [ "GOPATH=$(out)/share/go" ]; 21 + makeFlags = [ "GOPATH=${placeholder ''out''}/share/go" ]; 22 22 23 23 postPatch = '' 24 24 sed -i -e 's:/share/gocode:/share/go:' Makefile

+72 -24

pkgs/desktops/deepin/dde-api/default.nix

··· 1 1 { 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 + }: 5 25 6 26 buildGoPackage rec { 7 27 name = "${pname}-${version}"; 8 28 pname = "dde-api"; 9 - version = "3.5.0"; 29 + version = "3.18.1"; 10 30 11 31 goPackagePath = "pkg.deepin.io/dde/api"; 12 32 ··· 34 14 owner = "linuxdeepin"; 35 15 repo = pname; 36 16 rev = version; 37 - sha256 = "1g3s0i5wa6qyv00yksz4r4cy2vhiknq8v0yx7aribvwm3gxf7jw3"; 17 + sha256 = "0y8v18f6l3ycysdn4qi7c93z805q7alji8wix4j4qh9x9r35d728"; 38 18 }; 39 19 40 20 goDeps = ./deps.nix; 41 21 22 + outputs = [ "out" ]; 23 + 42 24 nativeBuildInputs = [ 43 25 pkgconfig 44 - deepin-gettext-tools 45 - go-dbus-factory 46 - go-gir-generator 47 - go-lib 26 + deepin-gettext-tools # build 27 + dbus-factory # build 28 + go-dbus-factory # needed 29 + go-gir-generator # needed 30 + go-lib # build 31 + deepin.setupHook 48 32 ]; 49 33 50 34 buildInputs = [ 51 - alsaLib 52 - glib 53 - gtk3 54 - libcanberra 55 - libgudev 56 - librsvg 57 - poppler 58 - pulseaudio 59 - ]; 35 + alsaLib # needed 36 + bc # run (to adjust grub theme?) 37 + blur-effect # run (is it really needed?) 38 + coreutils # run (is it really needed?) 39 + fontconfig # run (is it really needed?) 40 + #glib # ? arch 41 + grub2 # run (is it really needed?) 42 + gtk3 # build run 43 + libcanberra # build run 44 + libgudev # needed 45 + librsvg # build run 46 + poppler # build run 47 + pulseaudio # needed 48 + rfkill # run 49 + xcur2png # run 50 + #locales # run (locale-helper needs locale-gen, which is unavailable on NixOS?) 51 + ]; 60 52 61 53 postPatch = '' 62 - patchShebangs . 63 - sed -i -e "s|/var|$bin/var|" Makefile 54 + searchHardCodedPaths # debugging 55 + 56 + sed -i -e "s|/var|$out/var|" Makefile 57 + 58 + # TODO: confirm where to install grub themes 59 + sed -i -e "s|/boot/grub|$out/boot/grub|" Makefile 60 + 61 + fixPath $out /usr/lib/deepin-api \ 62 + lunar-calendar/main.go \ 63 + misc/services/com.deepin.api.CursorHelper.service \ 64 + misc/services/com.deepin.api.Graphic.service \ 65 + misc/services/com.deepin.api.LunarCalendar.service \ 66 + misc/services/com.deepin.api.Pinyin.service \ 67 + misc/system-services/com.deepin.api.Device.service \ 68 + misc/system-services/com.deepin.api.LocaleHelper.service \ 69 + misc/system-services/com.deepin.api.SoundThemePlayer.service \ 70 + misc/systemd/system/deepin-shutdown-sound.service \ 71 + theme_thumb/gtk/gtk.go \ 72 + thumbnails/gtk/gtk.go 64 73 ''; 65 74 66 75 buildPhase = '' ··· 97 48 ''; 98 49 99 50 installPhase = '' 100 - make install PREFIX="$bin" SYSTEMD_LIB_DIR="$bin/lib" -C go/src/${goPackagePath} 101 - mkdir -p $out/share 102 - mv $bin/share/gocode $out/share/go 103 - remove-references-to -t ${go} $bin/bin/* $bin/lib/deepin-api/* 51 + make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath} 52 + mv $out/share/gocode $out/share/go 53 + remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/* 104 54 ''; 105 55 106 56 passthru.updateScript = deepin.updateScript { inherit name; };

+11 -11

pkgs/desktops/deepin/dde-api/deps.nix

··· 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 2 2 [ 3 3 { 4 4 goPackagePath = "github.com/alecthomas/template"; ··· 32 32 fetch = { 33 33 type = "git"; 34 34 url = "https://github.com/disintegration/imaging"; 35 - rev = "9458da53d1e65e098d48467a4317c403327e4424"; 36 - sha256 = "1b0ma9if8s892qfx5b1vjinxn00ah9vsyxijs8knkilrhf5vqcx4"; 35 + rev = "061e8a750a4db9667cdf9e2af7f4029ba506cb3b"; 36 + sha256 = "13fkknwz2iby5rdzv9sgam6p27zdgxis3sxgyls9sdir5lbhjhm7"; 37 37 }; 38 38 } 39 39 { ··· 41 41 fetch = { 42 42 type = "git"; 43 43 url = "https://github.com/fogleman/gg"; 44 - rev = "0e0ff3ade7039063fe954cc1b45fad6cd4ac80db"; 45 - sha256 = "06gvsngfwizdxin90nldix5503fqgnwqmqvxzrz0xg5hfazwfra5"; 44 + rev = "0403632d5b905943a1c2a5b2763aaecd568467ec"; 45 + sha256 = "1nkldjghbqnzj2djfaxhiv35kk341xhcrj9m2dwq65v684iqkk8n"; 46 46 }; 47 47 } 48 48 { ··· 59 59 fetch = { 60 60 type = "git"; 61 61 url = "https://github.com/linuxdeepin/go-x11-client"; 62 - rev = "03541136501cab4910ad8852fe749ef8e18907ca"; 63 - sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp"; 62 + rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561"; 63 + sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl"; 64 64 }; 65 65 } 66 66 { ··· 77 77 fetch = { 78 78 type = "git"; 79 79 url = "https://go.googlesource.com/image"; 80 - rev = "69cc3646b96e61de0b417f4815b86c36e65783ee"; 81 - sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9"; 80 + rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65"; 81 + sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3"; 82 82 }; 83 83 } 84 84 { ··· 86 86 fetch = { 87 87 type = "git"; 88 88 url = "https://go.googlesource.com/net"; 89 - rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; 90 - sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; 89 + rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f"; 90 + sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s"; 91 91 }; 92 92 } 93 93 {

+7 -3

pkgs/desktops/deepin/dde-calendar/default.nix

··· 19 19 qmake 20 20 qttools 21 21 deepin-gettext-tools 22 + deepin.setupHook 22 23 ]; 23 24 24 25 buildInputs = [ ··· 28 27 ]; 29 28 30 29 postPatch = '' 31 - patchShebangs . 30 + searchHardCodedPaths 31 + patchShebangs translate_generation.sh 32 + patchShebangs translate_desktop.sh 33 + 34 + fixPath $out /usr com.deepin.Calendar.service 35 + 32 36 sed -i translate_desktop.sh \ 33 37 -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," 34 - sed -i com.deepin.Calendar.service \ 35 - -e "s,/usr,$out," 36 38 ''; 37 39 38 40 passthru.updateScript = deepin.updateScript { inherit name; };

+39 -14

pkgs/desktops/deepin/dde-daemon/default.nix

··· 1 1 { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, 2 2 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 }: 6 8 7 9 buildGoPackage rec { 8 10 name = "${pname}-${version}"; 9 11 pname = "dde-daemon"; 10 - version = "3.6.0"; 12 + version = "3.24.1"; 11 13 12 14 goPackagePath = "pkg.deepin.io/dde/daemon"; 13 15 ··· 17 15 owner = "linuxdeepin"; 18 16 repo = pname; 19 17 rev = version; 20 - sha256 = "0gn2zp34wg79lvzdfla6yb4gs3f9ll83kj765zvig1wpx51nq1aj"; 18 + sha256 = "1qxj0mqnl10qj8qidpc1sv8gm4gj5965i07d003yxlxcw9cqwx7y"; 21 19 }; 22 20 23 21 patches = [ 24 22 # https://github.com/linuxdeepin/dde-daemon/issues/51 25 23 (fetchpatch { 26 - name = "dde-daemon_3.2.3.patch"; 27 - url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.2.3.patch; 28 - sha256 = "0a3xb15czpfl2vajpf7ycw37vr7fbw2png1a67mvjjkgx7d1k7dg"; 24 + url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.8.0.patch; 25 + sha256 = "1ampdsp9zlg263flswdw9gj10n7gxh7zi6w6z9jgh29xlai05pvh"; 29 26 }) 30 27 ]; 31 28 ··· 39 38 go-gir-generator 40 39 go-lib 41 40 deepin-gettext-tools 42 - dde-api 43 41 linux-pam 44 42 networkmanager 45 43 networkmanager.dev 46 - python3Packages.python 44 + python3 45 + makeWrapper 46 + wrapGAppsHook 47 + deepin.setupHook 47 48 ]; 48 49 49 50 buildInputs = [ 50 51 alsaLib 52 + dde-api 53 + deepin-desktop-base 54 + deepin-desktop-schemas 55 + deepin-wallpapers 51 56 glib 52 - gnome3.libgudev 57 + libgudev 53 58 gtk3 54 59 hicolor-icon-theme 55 60 libinput 56 61 libnl 57 62 librsvg 58 63 pulseaudio 64 + tzdata 59 65 ]; 60 66 61 67 postPatch = '' 62 - patchShebangs . 68 + searchHardCodedPaths 69 + patchShebangs network/nm_generator/gen_nm_consts.py 63 70 64 - 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,' 71 + fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go 72 + fixPath ${networkmanager.dev} /usr/share/gir-1.0/NM-1.0.gir network/nm_generator/Makefile 73 + fixPath ${glibc.bin} /usr/bin/getconf systeminfo/utils.go 74 + fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go 75 + fixPath ${tzdata} /usr/share/zoneinfo timedate/zoneinfo/zone.go 76 + fixPath ${dde-api} /usr/lib/deepin-api grub2/modify_manger.go accounts/image_blur.go 77 + fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go 65 78 66 79 sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile 67 80 sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile 68 81 sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile 69 82 70 83 find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} + 84 + 85 + searchHardCodedPaths 71 86 ''; 72 87 73 88 buildPhase = '' 74 - make -C go/src/${goPackagePath} 75 89 # compilation of the nm module is failing 76 90 #make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code 91 + make -C go/src/${goPackagePath} 77 92 ''; 78 93 79 94 installPhase = '' 80 95 make install PREFIX="$out" -C go/src/${goPackagePath} 81 96 remove-references-to -t ${go} $out/lib/deepin-daemon/* 97 + searchHardCodedPaths $out 98 + ''; 99 + 100 + postFixup = '' 101 + # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec 102 + for binary in $out/lib/deepin-daemon/*; do 103 + wrapProgram $binary "''${gappsWrapperArgs[@]}" 104 + done 82 105 ''; 83 106 84 107 passthru.updateScript = deepin.updateScript { inherit name; };

+13 -13

pkgs/desktops/deepin/dde-daemon/deps.nix

··· 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 2 2 [ 3 3 { 4 4 goPackagePath = "github.com/alecthomas/template"; ··· 41 41 fetch = { 42 42 type = "git"; 43 43 url = "https://github.com/linuxdeepin/go-x11-client"; 44 - rev = "03541136501cab4910ad8852fe749ef8e18907ca"; 45 - sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp"; 44 + rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561"; 45 + sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl"; 46 46 }; 47 47 } 48 48 { ··· 50 50 fetch = { 51 51 type = "git"; 52 52 url = "https://github.com/msteinert/pam"; 53 - rev = "f4cd9f5e29232537a12db1678f48c702ad6896b7"; 54 - sha256 = "1vjawxswy3f23v4d72kk95y3b557580670ai9ffvrwy6wy85qync"; 53 + rev = "f29b9f28d6f9a1f6c4e6fd5db731999eb946574b"; 54 + sha256 = "1v5z51mgyz2glm7v0mg60xs1as88wx6cqhys2khc5d3khkr8q0qp"; 55 55 }; 56 56 } 57 57 { ··· 68 68 fetch = { 69 69 type = "git"; 70 70 url = "https://go.googlesource.com/image"; 71 - rev = "69cc3646b96e61de0b417f4815b86c36e65783ee"; 72 - sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9"; 71 + rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65"; 72 + sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3"; 73 73 }; 74 74 } 75 75 { ··· 77 77 fetch = { 78 78 type = "git"; 79 79 url = "https://go.googlesource.com/net"; 80 - rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; 81 - sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; 80 + rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f"; 81 + sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s"; 82 82 }; 83 83 } 84 84 { ··· 86 86 fetch = { 87 87 type = "git"; 88 88 url = "https://go.googlesource.com/text"; 89 - rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2"; 90 - sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj"; 89 + rev = "e3703dcdd614d2d7488fff034c75c551ea25da95"; 90 + sha256 = "1xh106aslp04vbzb4hc7cc5fyg2ljwny8fwfwsp5mpbqr9ixkikv"; 91 91 }; 92 92 } 93 93 { ··· 104 104 fetch = { 105 105 type = "git"; 106 106 url = "https://github.com/linuxdeepin/go-lib.git"; 107 - rev = "b199d0dc96e979398ea3985334ccf9c20236d1a7"; 108 - sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv"; 107 + rev = "3558b2348565e983c7d4a57a0a21bbe716a55b83"; 108 + sha256 = "0p9yrxa3x71n3jxffh03ahjgimdzvxzhny632k363lkha6glvbnc"; 109 109 }; 110 110 } 111 111 ]

+9 -6

pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix

··· 1 - { stdenv, fetchFromGitHub, pkgconfig, qmake, python, deepin }: 1 + { stdenv, fetchFromGitHub, pkgconfig, qmake, python3, deepin }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "${pname}-${version}"; 5 5 pname = "dde-qt-dbus-factory"; 6 - version = "1.0.5"; 6 + version = "1.1.1"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "linuxdeepin"; 10 10 repo = pname; 11 11 rev = version; 12 - sha256 = "0cz55hsbhy1ab1mndv0sp6xnqrhz2y66w7pcxy8v9k87ii32czf8"; 12 + sha256 = "1b2i5m6fzkga72hbl85v2rng3qq53di39p7jj2f119wmlfbyp2vg"; 13 13 }; 14 14 15 15 nativeBuildInputs = [ 16 16 qmake 17 - python 17 + python3 18 + deepin.setupHook 18 19 ]; 19 20 20 21 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 23 26 ''; 24 27 25 28 enableParallelBuilding = true;

+9 -4

pkgs/desktops/deepin/dde-session-ui/default.nix

··· 1 1 { stdenv, fetchFromGitHub, pkgconfig, qmake, qtsvg, qttools, 2 2 qtx11extras, xkeyboard_config, xorg, lightdm_qt, gsettings-qt, 3 3 dde-qt-dbus-factory, deepin-gettext-tools, dtkcore, dtkwidget, 4 - hicolor-icon-theme, deepin }: 4 + deepin-desktop-schemas, deepin, hicolor-icon-theme, wrapGAppsHook }: 5 5 6 6 stdenv.mkDerivation rec { 7 7 name = "${pname}-${version}"; 8 8 pname = "dde-session-ui"; 9 - version = "4.6.2"; 9 + version = "4.9.0"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "linuxdeepin"; 13 13 repo = pname; 14 14 rev = version; 15 - sha256 = "1fxlrj7vv7nqllwpwc8mxiv9bfqcj9b2qwkpjaq326pfmg5p5lhq"; 15 + sha256 = "1bh7wbkzikcnka94nzqzl87cs2m6bslrv9r2hdsvqqr3aaad5za3"; 16 16 }; 17 17 18 18 nativeBuildInputs = [ ··· 20 20 qmake 21 21 qttools 22 22 deepin-gettext-tools 23 + wrapGAppsHook 24 + deepin.setupHook 23 25 ]; 24 26 25 27 buildInputs = [ ··· 37 35 xorg.libXtst 38 36 xkeyboard_config 39 37 hicolor-icon-theme 38 + deepin-desktop-schemas 40 39 ]; 41 40 42 41 postPatch = '' 43 - patchShebangs . 42 + searchHardCodedPaths 43 + patchShebangs translate_generation.sh 44 + patchShebangs translate_desktop.sh 44 45 sed -i translate_desktop.sh -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," 45 46 find -type f -exec sed -i -e "s,path = /etc,path = $out/etc," {} + 46 47 find -type f -exec sed -i -e "s,path = /usr,path = $out," {} +

+29 -15

pkgs/desktops/deepin/deepin-desktop-base/default.nix

··· 3 3 stdenv.mkDerivation rec { 4 4 name = "${pname}-${version}"; 5 5 pname = "deepin-desktop-base"; 6 - version = "2018.10.29"; 6 + version = "2019.03.29"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "linuxdeepin"; 10 10 repo = pname; 11 11 rev = version; 12 - sha256 = "0l2zb7rpag2q36lqsgvirhjgmj7w243nsi1rywkypf2xm7g2v235"; 12 + sha256 = "1d016h95nsn5yay9f4c13hixfxj0q01hpxwj2x84i6qpx63dxdwq"; 13 13 }; 14 + 15 + nativeBuildInputs = [ deepin.setupHook ]; 14 16 15 17 buildInputs = [ deepin-wallpapers ]; 16 18 19 + # TODO: Fedora recommended dependencies: 20 + # deepin-wallpapers 21 + # plymouth-theme-deepin 22 + 17 23 postPatch = '' 18 - sed -i Makefile -e "s:/usr:$out:" -e "s:/etc:$out/etc:" 24 + searchHardCodedPaths 25 + 26 + fixPath $out /etc Makefile 27 + fixPath $out /usr Makefile 28 + 29 + # Remove Deepin distro's lsb-release 30 + # Don't override systemd timeouts 31 + # Remove apt-specific templates 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 19 37 ''; 20 38 21 39 postInstall = '' 22 - # Remove Deepin distro's lsb-release 23 - rm $out/etc/lsb-release 24 - 25 - # Don't override systemd timeouts 26 - rm -r $out/etc/systemd 27 - 28 - # Remove apt-specific templates 29 - rm -r $out/share/python-apt 30 - 31 - # Remove empty backgrounds directory 32 - rm -r $out/share/backgrounds 33 - 34 40 # Make a symlink for deepin-version 35 41 ln -s ../lib/deepin/desktop-version $out/etc/deepin-version 36 42 ''; ··· 45 39 46 40 meta = with stdenv.lib; { 47 41 description = "Base assets and definitions for Deepin Desktop Environment"; 42 + # TODO: revise 43 + longDescription = '' 44 + This package provides some components for Deepin desktop environment. 45 + - deepin logo 46 + - deepin desktop version 47 + - login screen background image 48 + - language information 49 + ''; 48 50 homepage = https://github.com/linuxdeepin/deepin-desktop-base; 49 51 license = licenses.gpl3; 50 52 platforms = platforms.linux;

+31 -8

pkgs/desktops/deepin/deepin-desktop-schemas/default.nix

··· 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 }: 4 3 5 4 stdenv.mkDerivation rec { 6 5 name = "${pname}-${version}"; 7 6 pname = "deepin-desktop-schemas"; 8 - version = "3.4.0"; 7 + version = "3.13.0"; 9 8 10 9 src = fetchFromGitHub { 11 10 owner = "linuxdeepin"; 12 11 repo = pname; 13 12 rev = version; 14 - sha256 = "10x0rh9z925yzyp8h0vgmg4313smvran06lvr12c3931qkmkzwgq"; 13 + sha256 = "0bamjcpmsl8xhw3ksgl11wv5xwcdhrkl1namikfzc4an03sk1rdq"; 15 14 }; 16 15 17 16 nativeBuildInputs = [ 18 - python 17 + python3 18 + glib.dev 19 + deepin.setupHook 19 20 ]; 20 21 21 22 buildInputs = [ ··· 28 27 ]; 29 28 30 29 postPatch = '' 30 + searchHardCodedPaths 31 + 31 32 # fix default background url 32 - sed -i '/picture-uri/s|/usr/share/backgrounds/default_background.jpg|$out/share/backgrounds/deepin/default.png|' \ 33 + sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \ 33 34 overrides/common/com.deepin.wrap.gnome.desktop.override 35 + 36 + fixPath ${deepin-wallpapers} /usr/share/backgrounds \ 37 + overrides/common/com.deepin.wrap.gnome.desktop.override 38 + 39 + fixPath ${deepin-wallpapers} /usr/share/wallpapers/deepin \ 40 + schemas/com.deepin.dde.appearance.gschema.xml 41 + 42 + # still hardcoded paths: 43 + # /etc/gnome-settings-daemon/xrandr/monitors.xml ? gnome3.gnome-settings-daemon 44 + # /usr/share/backgrounds/gnome/adwaita-lock.jpg ? gnome3.gnome-backgrounds 45 + # /usr/share/backgrounds/gnome/adwaita-timed.xml gnome3.gnome-backgrounds 46 + # /usr/share/desktop-directories 34 47 ''; 35 48 36 - makeFlags = [ "PREFIX=$(out)" ]; 49 + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; 50 + 51 + doCheck = true; 52 + checkTarget = "test"; 53 + 54 + postInstall = '' 55 + glib-compile-schemas --strict $out/share/glib-2.0/schemas 56 + searchHardCodedPaths $out 57 + ''; 37 58 38 59 passthru.updateScript = deepin.updateScript { inherit name; }; 39 60

+1 -1

pkgs/desktops/deepin/deepin-gettext-tools/default.nix

··· 24 24 python3Packages.python 25 25 ]; 26 26 27 - makeFlags = [ "PREFIX=$(out)" ]; 27 + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; 28 28 29 29 postPatch = '' 30 30 sed -e 's/sudo cp/cp/' -i src/generate_mo.py

+1 -1

pkgs/desktops/deepin/deepin-gtk-theme/default.nix

··· 14 14 15 15 propagatedUserEnvPkgs = [ gtk-engine-murrine ]; 16 16 17 - makeFlags = [ "PREFIX=$(out)" ]; 17 + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; 18 18 19 19 passthru.updateScript = deepin.updateScript { inherit name; }; 20 20

+18 -8

pkgs/desktops/deepin/deepin-icon-theme/default.nix

··· 1 - { stdenv, fetchFromGitHub, gtk3, papirus-icon-theme, deepin }: 1 + { stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "${pname}-${version}"; 5 5 pname = "deepin-icon-theme"; 6 - version = "15.12.64"; 6 + version = "15.12.68"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "linuxdeepin"; 10 10 repo = pname; 11 11 rev = version; 12 - sha256 = "0z1yrp6yg2hb67azrbd9ac743jjh83vxdf2j0mmv2lfpd4fqw8qc"; 12 + sha256 = "12jgz81s5qggmnkfg9m5f799r10p43qmh4zqxl1kjvlrqgvsc9rf"; 13 13 }; 14 14 15 - nativeBuildInputs = [ gtk3 papirus-icon-theme ]; 15 + nativeBuildInputs = [ gtk3 xcursorgen ]; 16 + 17 + buildInputs = [ papirus-icon-theme ]; 16 18 17 19 postPatch = '' 18 - patchShebangs . 19 - 20 - # install in $out 21 - sed -i -e "s|/usr|$out|g" Makefile tools/hicolor.links 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 22 24 23 25 # keep icon-theme.cache 24 26 sed -i -e 's|$-rm -f .*/icon-theme.cache$|# \1|g' Makefile 27 + ''; 28 + 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/ 25 35 ''; 26 36 27 37 passthru.updateScript = deepin.updateScript { inherit name; };

+6 -5

pkgs/desktops/deepin/deepin-image-viewer/default.nix

··· 6 6 stdenv.mkDerivation rec { 7 7 name = "${pname}-${version}"; 8 8 pname = "deepin-image-viewer"; 9 - version = "1.3.1"; 9 + version = "1.3.10"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "linuxdeepin"; 13 13 repo = pname; 14 14 rev = version; 15 - sha256 = "0dxdvm6hzj6izfxka35za8y7vacd06nksfgzx6xsv7ywzagri4k5"; 15 + sha256 = "0paanw9sd67ic9yrbzqhrwi4bf4lpvsk16jynx99n76j3jgyijkk"; 16 16 }; 17 17 18 18 nativeBuildInputs = [ 19 19 pkgconfig 20 20 qmake 21 21 qttools 22 + deepin.setupHook 22 23 ]; 23 24 24 25 buildInputs = [ ··· 34 33 ]; 35 34 36 35 postPatch = '' 37 - patchShebangs . 36 + searchHardCodedPaths 37 + patchShebangs viewer/generate_translations.sh 38 + fixPath $out /usr viewer/com.deepin.ImageViewer.service 38 39 sed -i qimage-plugins/freeimage/freeimage.pro \ 39 40 qimage-plugins/libraw/libraw.pro \ 40 41 -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," 41 - sed -i viewer/com.deepin.ImageViewer.service \ 42 - -e "s,/usr,$out," 43 42 ''; 44 43 45 44 passthru.updateScript = deepin.updateScript { inherit name; };

+6 -1

pkgs/desktops/deepin/deepin-menu/default.nix

······

+10 -9

pkgs/desktops/deepin/deepin-metacity/default.nix

··· 1 - { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, 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 }: 4 5 5 6 stdenv.mkDerivation rec { 6 7 name = "${pname}-${version}"; 7 8 pname = "deepin-metacity"; 8 - version = "3.22.22"; 9 + version = "3.22.24"; 9 10 10 11 src = fetchFromGitHub { 11 12 owner = "linuxdeepin"; 12 13 repo = pname; 13 14 rev = version; 14 - sha256 = "0gr10dv8vphla6z7zqiyyg3n3ag4rrlz43c4kr7fd5xwx2bfvp3d"; 15 + sha256 = "1im0wz1zlxiag4kpp5d4hv0aa0ybr4bizarr3903hrqv0lp46hyx"; 15 16 }; 16 17 17 18 nativeBuildInputs = [ 18 19 pkgconfig 19 20 intltool 20 21 libtool 22 + glib.dev 21 23 gnome3.gnome-common 22 - gnome3.glib.dev 23 24 ]; 24 25 25 26 buildInputs = [ 26 27 gnome3.dconf 27 - gnome3.gtk 28 - gnome3.libgtop 28 + gtk3 29 + libgtop 29 30 gnome3.zenity 30 31 bamf 31 32 json-glib ··· 42 41 -e 's;/usr/share/backgrounds/default_background.jpg;${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg;' 43 42 ''; 44 43 45 - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; 44 + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; 46 45 47 46 configureFlags = [ "--disable-themes-documentation" ]; 48 47

+2 -2

pkgs/desktops/deepin/deepin-movie-reborn/default.nix

··· 5 5 stdenv.mkDerivation rec { 6 6 name = "${pname}-${version}"; 7 7 pname = "deepin-movie-reborn"; 8 - version = "3.2.14"; 8 + version = "3.2.21"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "linuxdeepin"; 12 12 repo = pname; 13 13 rev = version; 14 - sha256 = "1i9sdg2p6qp57rqzrnjbxnqj3mg1qggzyq3yykw271vs8h85a707"; 14 + sha256 = "09a4sirbdxnrwj9ww2v7b1s9ylsincqzpqm2zisny9zxy22fm8s9"; 15 15 }; 16 16 17 17 nativeBuildInputs = [

+28 -19

pkgs/desktops/deepin/deepin-mutter/default.nix

··· 1 - { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, 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 }: 4 6 5 7 stdenv.mkDerivation rec { 6 8 name = "${pname}-${version}"; 7 9 pname = "deepin-mutter"; 8 - version = "3.20.35"; 10 + version = "3.20.38"; 9 11 10 12 src = fetchFromGitHub { 11 13 owner = "linuxdeepin"; 12 14 repo = pname; 13 15 rev = version; 14 - sha256 = "0mwk06kgw8qp8rg1j6px1zlya4x5rr9llax0qks59j56b3m9yim7"; 16 + sha256 = "1aq7606sgn2c6n8wfgxdryw3lprc4va0zjc0r65798w5656fdi31"; 15 17 }; 16 18 17 19 nativeBuildInputs = [ ··· 21 19 intltool 22 20 libtool 23 21 gnome3.gnome-common 22 + wrapGAppsHook 23 + deepin.setupHook 24 24 ]; 25 25 26 26 buildInputs = [ 27 - gnome3.gtk 28 - gnome3.gnome-desktop 29 - gnome3.gsettings-desktop-schemas 30 - gnome3.libgudev 31 - gnome3.zenity 32 - upower 33 - xorg.libxkbfile 34 - libxkbcommon 35 - libcanberra-gtk3 36 - libstartup_notification 37 - libinput 38 - xkeyboard_config 39 - cogl 40 27 clutter 28 + cogl 29 + deepin-desktop-schemas 30 + gnome3.gnome-desktop 31 + gnome3.zenity 32 + gsettings-desktop-schemas 33 + gtk3 34 + libcanberra-gtk3 35 + libgudev 36 + libinput 37 + libstartup_notification 38 + libxkbcommon 41 39 systemd 40 + upower 41 + xkeyboard_config 42 + xorg.libxkbfile 42 43 ]; 43 44 44 - enableParallelBuilding = true; 45 + postPatch = '' 46 + searchHardCodedPaths 47 + ''; 45 48 46 49 configureFlags = [ 47 50 "--enable-native-backend" ··· 56 49 preConfigure = '' 57 50 NOCONFIGURE=1 ./autogen.sh 58 51 ''; 52 + 53 + enableParallelBuilding = true; 59 54 60 55 passthru.updateScript = deepin.updateScript { inherit name; }; 61 56

+1 -1

pkgs/desktops/deepin/deepin-sound-theme/default.nix

··· 12 12 sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9"; 13 13 }; 14 14 15 - makeFlags = [ "PREFIX=$(out)" ]; 15 + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; 16 16 17 17 passthru.updateScript = deepin.updateScript { inherit name; }; 18 18

+15 -10

pkgs/desktops/deepin/deepin-terminal/default.nix

··· 1 1 { 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 }: 6 6 7 7 stdenv.mkDerivation rec { 8 8 name = "${pname}-${version}"; 9 9 pname = "deepin-terminal"; 10 - version = "3.0.10.2"; 10 + version = "3.2.1.2"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "linuxdeepin"; 14 14 repo = "deepin-terminal"; 15 15 rev = version; 16 - sha256 = "0ylhp8q9kfdq9l69drawjaf0q8vcqyflb2a3zfnwbnf06dlpvkz6"; 16 + sha256 = "0dj386csbiw0yqz9nj6ij0s4d0ak9lpq2bmsfs17bjkgdp0ayp90"; 17 17 }; 18 18 19 19 nativeBuildInputs = [ ··· 22 22 ninja 23 23 vala 24 24 gettext 25 - gobject-introspection # For setup hook 25 + libselinux libsepol utillinux # required by gio 26 + deepin.setupHook 26 27 ]; 27 28 28 29 buildInputs = [ ··· 50 49 ]; 51 50 52 51 postPatch = '' 53 - patchShebangs . 52 + searchHardCodedPaths 54 53 ''; 55 54 56 - enableParallelBuilding = true; 55 + cmakeFlags = [ 56 + "-DTEST_BUILD=OFF" 57 + "-DUSE_VENDOR_LIB=OFF" 58 + "-DVERSION=${version}" 59 + ]; 57 60 58 61 passthru.updateScript = deepin.updateScript { inherit name; }; 59 62 60 63 meta = with stdenv.lib; { 61 - description = "The default terminal emulation for Deepin"; 64 + description = "Default terminal emulator for Deepin"; 62 65 longDescription = '' 63 66 Deepin terminal, it sharpens your focus in the world of command line! 64 67 It is an advanced terminal emulator with workspace, multiple

+6 -4

pkgs/desktops/deepin/deepin-wallpapers/default.nix

··· 3 3 stdenv.mkDerivation rec { 4 4 name = "${pname}-${version}"; 5 5 pname = "deepin-wallpapers"; 6 - version = "1.7.5"; 6 + version = "1.7.7"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "linuxdeepin"; 10 10 repo = "deepin-wallpapers"; 11 11 rev = version; 12 - sha256 = "0mfjkh81ci0gjwmgycrh32by7v9b73nyvyjbqd29ccpb8bpyyakn"; 12 + sha256 = "09cfnxbpms98ibqbi4xd51181q3az5n8rmndcdr9w12kyzniz7xv"; 13 13 }; 14 14 15 - nativeBuildInputs = [ dde-api.bin ]; 15 + nativeBuildInputs = [ dde-api deepin.setupHook ]; 16 16 17 17 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 19 21 sed -i -e "s:/usr/share/wallpapers:$out/share/wallpapers:" Makefile 20 22 ''; 21 23

+22 -16

pkgs/desktops/deepin/deepin-wm/default.nix

··· 1 1 { 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 }: 5 5 6 6 stdenv.mkDerivation rec { 7 7 name = "${pname}-${version}"; 8 8 pname = "deepin-wm"; 9 - version = "1.9.34"; 9 + version = "1.9.37"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "linuxdeepin"; 13 13 repo = pname; 14 14 rev = version; 15 - sha256 = "13hydcalifdc6723k8l4pk905y9sxic5x1fqww0fyx7j6b3hm13f"; 15 + sha256 = "1xd2x0kyav2cxnk0bybl7lrmak1r2468slxz5a6anrdriw9l10gi"; 16 16 }; 17 17 18 18 nativeBuildInputs = [ 19 19 pkgconfig 20 20 intltool 21 21 libtool 22 - gnome3.gnome-common 23 22 vala 23 + gnome3.gnome-common 24 + wrapGAppsHook 25 + deepin.setupHook 24 26 ]; 25 27 26 28 buildInputs = [ 27 - gnome3.gnome-desktop 28 - gnome3.libgee 29 29 bamf 30 30 clutter-gtk 31 - pantheon.granite 32 - libcanberra-gtk3 33 - libwnck3 31 + deepin-desktop-schemas 32 + deepin-menu 34 33 deepin-mutter 35 34 deepin-wallpapers 36 - deepin-desktop-schemas 37 - hicolor-icon-theme 35 + gnome3.gnome-desktop 36 + libcanberra-gtk3 37 + libgee 38 + libwnck3 39 + pantheon.granite 38 40 ]; 39 41 40 42 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 43 47 ''; 44 48 49 + NIX_CFLAGS_COMPILE = "-DWNCK_I_KNOW_THIS_IS_UNSTABLE"; 50 + 45 51 preConfigure = '' 46 - ./autogen.sh 52 + NOCONFIGURE=1 ./autogen.sh 47 53 ''; 48 54 49 55 enableParallelBuilding = true;

+2 -1

pkgs/desktops/deepin/default.nix

··· 2 2 3 3 let 4 4 packages = self: with self; { 5 + setupHook = ./setup-hook.sh; 6 + 5 7 updateScript = callPackage ./update.nix { }; 6 8 7 9 dbus-factory = callPackage ./dbus-factory { }; ··· 25 23 deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; 26 24 deepin-sound-theme = callPackage ./deepin-sound-theme { }; 27 25 deepin-terminal = callPackage ./deepin-terminal { 28 - inherit (pkgs.gnome3) libgee; 29 26 wnck = pkgs.libwnck3; 30 27 }; 31 28 deepin-wallpapers = callPackage ./deepin-wallpapers { };

+2 -2

pkgs/desktops/deepin/dtkcore/default.nix

··· 3 3 stdenv.mkDerivation rec { 4 4 name = "${pname}-${version}"; 5 5 pname = "dtkcore"; 6 - version = "2.0.9.8"; 6 + version = "2.0.10"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "linuxdeepin"; 10 10 repo = pname; 11 11 rev = version; 12 - sha256 = "06jj5gpy2qbmc21nf0fnbvgw7nbjjgvzx7m2vg9byw5il8l4g22h"; 12 + sha256 = "0dwpq6c38gaa95mgjnwj3vjz57n0cz6jfk950xi6s9ww2f4g6kq7"; 13 13 }; 14 14 15 15 nativeBuildInputs = [

+2 -2

pkgs/desktops/deepin/dtkwidget/default.nix

··· 5 5 stdenv.mkDerivation rec { 6 6 name = "${pname}-${version}"; 7 7 pname = "dtkwidget"; 8 - version = "2.0.9.10"; 8 + version = "2.0.10"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "linuxdeepin"; 12 12 repo = pname; 13 13 rev = version; 14 - sha256 = "0757dzy82bfv97b1gzkwa9zx3jzfbap20v3r1h7lkfcfw95410iw"; 14 + sha256 = "11a7yirfkcj3rq7va9av4m1pr22mq1yx1j9k18xrqv36n0rlbrr6"; 15 15 }; 16 16 17 17 nativeBuildInputs = [

+3 -3

pkgs/desktops/deepin/go-dbus-factory/default.nix

··· 3 3 stdenv.mkDerivation rec { 4 4 name = "${pname}-${version}"; 5 5 pname = "go-dbus-factory"; 6 - version = "0.0.7.1"; 6 + version = "0.4.0"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "linuxdeepin"; 10 10 repo = pname; 11 11 rev = version; 12 - sha256 = "0gj2xxv45gh7wr5ry3mcsi46kdsyq9nbd7znssn34kapiv40ixcx"; 12 + sha256 = "1i1ymi2qpcbf4d6rnfzrbq5n2vwnn8dvbq9xlw7jls3jpr3d5r00"; 13 13 }; 14 14 15 - makeFlags = [ "PREFIX=$(out)" ]; 15 + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; 16 16 17 17 postPatch = '' 18 18 sed -i -e 's:/share/gocode:/share/go:' Makefile

+2 -2

pkgs/desktops/deepin/go-dbus-generator/default.nix

··· 18 18 ]; 19 19 20 20 makeFlags = [ 21 - "PREFIX=$(out)" 22 - "GOCACHE=off" 21 + "PREFIX=${placeholder ''out''}" 22 + "GOCACHE=$(TMPDIR)/go-cache" 23 23 ]; 24 24 25 25 passthru.updateScript = deepin.updateScript { inherit name; };

+4 -12

pkgs/desktops/deepin/go-gir-generator/default.nix

··· 4 4 stdenv.mkDerivation rec { 5 5 name = "${pname}-${version}"; 6 6 pname = "go-gir-generator"; 7 - version = "1.1.0"; 7 + version = "2.0.0"; 8 8 9 9 src = fetchFromGitHub { 10 10 owner = "linuxdeepin"; 11 11 repo = pname; 12 12 rev = version; 13 - sha256 = "0grp4ffy3vmlknzmymnxq1spwshff2ylqsw82pj4y2v2fcvnqfvb"; 13 + sha256 = "0d93qzp3dlia5d1yxw0rwca76qk3jyamj9xzmk13vzig8zw0jx16"; 14 14 }; 15 - 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 15 24 16 nativeBuildInputs = [ 25 17 pkgconfig ··· 28 36 ''; 29 37 30 38 makeFlags = [ 31 - "PREFIX=$(out)" 32 - "GOCACHE=off" 39 + "PREFIX=${placeholder ''out''}" 40 + "GOCACHE=$(TMPDIR)/go-cache" 33 41 ]; 34 42 35 43 passthru.updateScript = deepin.updateScript { inherit name; };

+8 -6

pkgs/desktops/deepin/go-lib/default.nix

··· 4 4 stdenv.mkDerivation rec { 5 5 name = "${pname}-${version}"; 6 6 pname = "go-lib"; 7 - version = "1.3.0"; 7 + version = "1.10.0"; 8 8 9 9 src = fetchFromGitHub { 10 10 owner = "linuxdeepin"; 11 11 repo = pname; 12 12 rev = version; 13 - sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv"; 13 + sha256 = "090l33y79gdj2xy1bhk2ksl6hvmsfhmx0bhygm4y4d0iqckf2x2m"; 14 14 }; 15 15 16 16 buildInputs = [ ··· 21 21 mobile-broadband-provider-info 22 22 ]; 23 23 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 + ''; 28 30 29 31 passthru.updateScript = deepin.updateScript { inherit name; }; 30 32

+2 -2

pkgs/desktops/deepin/qt5dxcb-plugin/default.nix

··· 4 4 stdenv.mkDerivation rec { 5 5 name = "${pname}-${version}"; 6 6 pname = "qt5dxcb-plugin"; 7 - version = "1.1.13"; 7 + version = "1.1.25"; 8 8 9 9 src = fetchFromGitHub { 10 10 owner = "linuxdeepin"; 11 11 repo = pname; 12 12 rev = version; 13 - sha256 = "12lvh3agw3qdviqf32brmzba5kscnj5al5jhc08lq69a9kmip05x"; 13 + sha256 = "1nadmj1hdpw4n3kpk3dlx22bmxdli66abhjl73hwrbvszmmcm9vp"; 14 14 }; 15 15 16 16 nativeBuildInputs = [

+2 -2

pkgs/desktops/deepin/qt5integration/default.nix

··· 5 5 stdenv.mkDerivation rec { 6 6 name = "${pname}-${version}"; 7 7 pname = "qt5integration"; 8 - version = "0.3.6"; 8 + version = "0.3.8"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "linuxdeepin"; 12 12 repo = pname; 13 13 rev = version; 14 - sha256 = "1v9whlqn07c5c8xnaiicdshj9n88a667gfbn8y8bk5bfylilfzcy"; 14 + sha256 = "12d6iv2x0q2n73rscma30q31nh7h26gmhlf665gkgl2j825hlx5n"; 15 15 }; 16 16 17 17 nativeBuildInputs = [

+53

pkgs/desktops/deepin/setup-hook.sh

··· 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 + }

+33

pkgs/tools/graphics/blur-effect/default.nix

··· 1 + { stdenv, fetchFromGitHub, pkgconfig, cmake, gdk_pixbuf, libGL, mesa }: 2 + 3 + stdenv.mkDerivation rec { 4 + pname = "blur-effect"; 5 + version = "1.1.3"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "sonald"; 9 + repo = pname; 10 + rev = version; 11 + sha256 = "0cjw7iz0p7x1bi4vmwrivfidry5wlkgfgdl9wly88cm3z9ib98jj"; 12 + }; 13 + 14 + nativeBuildInputs = [ 15 + pkgconfig 16 + cmake 17 + ]; 18 + 19 + buildInputs = [ 20 + gdk_pixbuf 21 + libGL 22 + mesa 23 + ]; 24 + 25 + meta = with stdenv.lib; { 26 + homepage = https://github.com/sonald/blur-effect; 27 + description = "Off-screen image blurring utility using OpenGL ES 3.0"; 28 + license = licenses.gpl3; 29 + platforms = platforms.unix; 30 + broken = stdenv.hostPlatform.isDarwin; # packages 'libdrm' and 'gbm' not found 31 + maintainers = with maintainers; [ romildo ]; 32 + }; 33 + }

+32

pkgs/tools/graphics/xcur2png/default.nix

··· 1 + { stdenv, fetchFromGitHub, pkgconfig, libpng, xorg }: 2 + 3 + stdenv.mkDerivation rec { 4 + pname = "xcur2png"; 5 + version = "0.7.1"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "eworm-de"; 9 + repo = pname; 10 + rev = version; 11 + sha256 = "0858wn2p14bxpv9lvaz2bz1rk6zk0g8zgxf8iy595m8fqv4q2fya"; 12 + }; 13 + 14 + nativeBuildInputs = [ 15 + pkgconfig 16 + ]; 17 + 18 + buildInputs = [ 19 + libpng 20 + xorg.libX11 21 + xorg.libXcursor 22 + xorg.xorgproto 23 + ]; 24 + 25 + meta = with stdenv.lib; { 26 + homepage = https://github.com/eworm-de/xcur2png/releases; 27 + description = "Convert X cursors to PNG images"; 28 + license = licenses.gpl3; 29 + platforms = platforms.unix; 30 + maintainers = with maintainers; [ romildo ]; 31 + }; 32 + }

+4

pkgs/top-level/all-packages.nix

··· 960 960 961 961 bluemix-cli = callPackage ../tools/admin/bluemix-cli { }; 962 962 963 + blur-effect = callPackage ../tools/graphics/blur-effect { }; 964 + 963 965 charles = charles4; 964 966 inherit (callPackage ../applications/networking/charles {}) 965 967 charles3 ··· 6397 6395 clipnotify = callPackage ../tools/misc/clipnotify { }; 6398 6396 6399 6397 xclip = callPackage ../tools/misc/xclip { }; 6398 + 6399 + xcur2png = callPackage ../tools/graphics/xcur2png { }; 6400 6400 6401 6401 xcwd = callPackage ../tools/X11/xcwd { }; 6402 6402