From 75771333d22f0e44998e456fd06464502084095d Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Mon, 25 May 2020 17:04:39 -0300 Subject: deepin.deepin-icon-theme: 15.12.71 -> 2020.05.21 --- pkgs/desktops/deepin/deepin-icon-theme/default.nix | 35 +++++++++++++--------- 1 file changed, 21 insertions(+), 14 deletions(-) (limited to 'pkgs/desktops/deepin') diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index 464d6f19ceda..b56b219faffa 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -3,19 +3,19 @@ , gtk3 , xcursorgen , papirus-icon-theme -, deepin , hicolor-icon-theme +, deepin }: stdenv.mkDerivation rec { pname = "deepin-icon-theme"; - version = "15.12.71"; + version = "2020.05.21"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "12rzzjp906np95ckbxrd4mb345lm198wz69kxy48f8q1zg78q8iw"; + sha256 = "0b1s6kf0q804zbbghly981wzacy1spi8168shf3x8w95rqj6463p"; }; nativeBuildInputs = [ @@ -30,22 +30,29 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; + buildTargets = "all hicolor-links"; + postPatch = '' - patchShebangs tools/hicolor.links - patchShebangs tools/display_unused_links.sh - patchShebangs cursors-src/cursors/bitmaps/make.sh - patchShebangs cursors-src/render-cursors.sh + # fix: hicolor links should follow the deepin -> bloom naming change + # https://github.com/linuxdeepin/deepin-icon-theme/pull/24 + substituteInPlace tools/hicolor.links --replace deepin bloom - # keep icon-theme.cache - sed -i -e 's|\(-rm -f .*/icon-theme.cache\)|# \1|g' Makefile + substituteInPlace Sea/index.theme --replace Inherits=deepin Inherits=bloom ''; - buildTargets = "all hicolor-links"; - installTargets = [ "install-icons" "install-cursors" ]; - installFlags = [ "PREFIX=${placeholder "out"}" ]; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + cp -vai bloom* Sea $out/share/icons + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + cp -vai usr/share/icons/hicolor $out/share/icons - postInstall = '' - cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/ + runHook postInstall ''; passthru.updateScript = deepin.updateScript { inherit pname version src; }; -- cgit 1.4.1 From b246cb2182c6b458a6d3a201c91f17bfc316344b Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Mon, 25 May 2020 19:01:23 -0300 Subject: deepin.disomaster: 5.0.0 -> 5.0.1 --- pkgs/desktops/deepin/disomaster/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgs/desktops/deepin') diff --git a/pkgs/desktops/deepin/disomaster/default.nix b/pkgs/desktops/deepin/disomaster/default.nix index 758c8ff76c3e..89cbe34ceaa2 100644 --- a/pkgs/desktops/deepin/disomaster/default.nix +++ b/pkgs/desktops/deepin/disomaster/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "disomaster"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "13144gq0mpbpclzxc79fb1kirh0vvi50jvjnbpla9s8lvh59xl62"; + sha256 = "1kmhlnw37pdmlf7k9zry657xlhz40m9nzg361kiyisn186pfqpws"; }; nativeBuildInputs = [ @@ -32,11 +32,12 @@ mkDerivation rec { postPatch = '' searchHardCodedPaths # debugging - - sed -i '/^QMAKE_PKGCONFIG_DESTDIR/i QMAKE_PKGCONFIG_PREFIX = $$PREFIX' \ - libdisomaster/libdisomaster.pro ''; + qmakeFlags = [ + "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}" + ]; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { -- cgit 1.4.1 From 52c348b63019e6e6ae96aceb1efa2d3b6fea7085 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Mon, 25 May 2020 19:14:00 -0300 Subject: deepin.udisks2-qt5: 5.0.0 -> 5.0.3 --- pkgs/desktops/deepin/udisks2-qt5/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'pkgs/desktops/deepin') diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix index 385fedfc4780..0fcc2e9f9f71 100644 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "udisks2-qt5"; - version = "5.0.0"; + version = "5.0.3"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0mqxm6ixzpbg0rr6ly2kvnkpag8gjza67ya7jv4i4rihbq1d0wzi"; + sha256 = "0c87ks9glwhk4m2s7kf7mb43q011yi6l3qjq2ammmfqwl8xal69a"; }; nativeBuildInputs = [ @@ -27,11 +27,15 @@ mkDerivation rec { ]; postPatch = '' - searchHardCodedPaths + searchHardCodedPaths # debugging ''; + qmakeFlags = [ + "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}" + ]; + postFixup = '' - searchHardCodedPaths $out + searchHardCodedPaths $out # debugging ''; passthru.updateScript = deepin.updateScript { inherit pname version src; }; -- cgit 1.4.1 From 50e8c57a997bb8b06d1cd8deccd040e7b6eb9b5c Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Mon, 25 May 2020 20:35:55 -0300 Subject: deepin.go-lib: 5.0.0 -> 5.4.5 --- pkgs/desktops/deepin/go-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/desktops/deepin') diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index d45351fd6dcb..7129d912e30d 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "go-lib"; - version = "5.0.0"; + version = "5.4.5"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0j1ik5hfrysqgync8cyv815cwyjn67k8n69x6llxdp39jli1k8q0"; + sha256 = "021sq7nzvfwsa5ccsb3vdjk53m7cf693xm4wkdkrkf8pja6vz94q"; }; buildInputs = [ -- cgit 1.4.1