diff options
Diffstat (limited to 'pkgs/desktops/deepin/go-package')
8 files changed, 25 insertions, 134 deletions
diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix index d86c369763023..890ce1b64f75d 100644 --- a/pkgs/desktops/deepin/go-package/dde-api/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-api/default.nix @@ -5,7 +5,7 @@ , pkg-config , deepin-gettext-tools , wrapQtAppsHook -, wrapGAppsHook +, wrapGAppsHook3 , alsa-lib , gtk3 , libcanberra @@ -20,13 +20,13 @@ buildGoModule rec { pname = "dde-api"; - version = "6.0.9"; + version = "6.0.11"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-ht5IaXi4nz0/U1zqp4JTiDkQ3NB69q24MgWfu45SpoY="; + hash = "sha256-VpZwVNXxdi8ODwxbksQpT0nnUuLOTJ9h0JYucEKdGYM="; }; vendorHash = "sha256-zrtUsCF2+301DKwgWectw+UbOehOp8h8u/IMf09XQ8Q="; @@ -57,7 +57,7 @@ buildGoModule rec { pkg-config deepin-gettext-tools wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix index b79f1fe472d11..14fe7c03c3e38 100644 --- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -7,7 +7,7 @@ , deepin-gettext-tools , gettext , python3 -, wrapGAppsHook +, wrapGAppsHook3 , ddcutil , alsa-lib , glib @@ -64,23 +64,26 @@ buildGoModule rec { postPatch = '' substituteInPlace session/eventlog/{app_event.go,login_event.go} \ - --replace "/bin/bash" "${runtimeShell}" + --replace-fail "/bin/bash" "${runtimeShell}" substituteInPlace inputdevices/layout_list.go \ - --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" + --replace-fail "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" - substituteInPlace bin/dde-system-daemon/wallpaper.go accounts1/user.go \ - --replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" + substituteInPlace accounts1/user.go \ + --replace-fail "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" substituteInPlace timedate1/zoneinfo/zone.go \ - --replace "/usr/share/dde" "$out/share/dde" \ - --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + --replace-fail "/usr/share/dde" "$out/share/dde" \ + --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" substituteInPlace accounts1/image_blur.go grub2/modify_manger.go \ - --replace "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" + --replace-fail "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" substituteInPlace accounts1/user_chpwd_union_id.go \ - --replace "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" + --replace-fail "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" + + substituteInPlace system/uadp1/crypto.go \ + --replace-fail "/usr/share/uadp" "/var/lib/dde-daemon/uadp" for file in $(grep "/usr/lib/deepin-daemon" * -nR |awk -F: '{print $1}') do @@ -95,7 +98,7 @@ buildGoModule rec { deepin-gettext-tools gettext python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix index 4dab20303d8c2..61d7c18dca2d2 100644 --- a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "deepin-desktop-schemas"; - version = "6.0.5"; + version = "6.0.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-lvAY0CJ+EohMK16fwIkB7Jq7gTpMhDimPYs9b/IklA4="; + hash = "sha256-zheIZ3Z0vm0/0F9hFcdlYwhE3/PRunxUCT8KSe4T3wk="; }; vendorHash = "sha256-q6ugetchJLv2JjZ9+nevUI0ptizh2V+6SByoY/eFJJQ="; diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix index d01c45c654d21..fd50f71ac2013 100644 --- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix @@ -41,9 +41,9 @@ buildGoModule rec { ]; postPatch = '' - sed -i 's|iniparser/||' */*.c + sed -i '1i#include <stdlib.h>\n#include <string.h>' tool/pwd_conf_update.c substituteInPlace misc/{pkgconfig/libdeepin_pw_check.pc,system-services/org.deepin.dde.PasswdConf1.service} \ - --replace "/usr" "$out" + --replace-fail "/usr" "$out" ''; buildPhase = '' diff --git a/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix deleted file mode 100644 index eed8208367b0b..0000000000000 --- a/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "go-dbus-factory"; - version = "2.0.8"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-yzmr61wrBfZi+CuXFhtvOk7EaFtE8y3QyVwwgEDqwKY="; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - description = "Generate go binding of D-Bus interfaces"; - homepage = "https://github.com/linuxdeepin/go-dbus-factory"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix deleted file mode 100644 index 45c486d606d33..0000000000000 --- a/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, go -, pkg-config -, libgudev -, gobject-introspection -}: - -stdenv.mkDerivation rec { - pname = "go-gir-generator"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-lFseui/M3+TyfYoa+rnS0cGhN6gdLrgpzgOwqzYcyPk="; - }; - - nativeBuildInputs = [ - pkg-config - go - gobject-introspection - ]; - - buildInputs = [ - libgudev - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "GOCACHE=$(TMPDIR)/go-cache" - ]; - - meta = with lib; { - description = "Generate static golang bindings for GObject"; - mainProgram = "gir-generator"; - homepage = "https://github.com/linuxdeepin/go-gir-generator"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/go-package/go-lib/default.nix b/pkgs/desktops/deepin/go-package/go-lib/default.nix deleted file mode 100644 index 751cba56ce35c..0000000000000 --- a/pkgs/desktops/deepin/go-package/go-lib/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, runtimeShell -}: - -stdenv.mkDerivation rec { - pname = "go-lib"; - version = "5.8.27"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-ZV5zWu7UvNKVcVo79/iKMhF4H09rGyDCvEL61H05lZc="; - }; - - patches = [ - (fetchpatch { - name = "fix_IsDir_for_symlink.patch"; - url = "https://github.com/linuxdeepin/go-lib/commit/79239904679dc70a11e1ac8e65670afcfdd7c122.patch"; - sha256 = "sha256-RsN9hK26i/W6P/+e1l1spCLdlgIEWTehhIW6POBOvW4="; - }) - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gocode/src/github.com/linuxdeepin/go-lib - cp -a * $out/share/gocode/src/github.com/linuxdeepin/go-lib - rm -r $out/share/gocode/src/github.com/linuxdeepin/go-lib/debian - runHook postInstall - ''; - - meta = with lib; { - description = "Library containing many useful go routines for things such as glib, gettext, archive, graphic, etc"; - homepage = "https://github.com/linuxdeepin/go-lib"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/go-package/startdde/default.nix b/pkgs/desktops/deepin/go-package/startdde/default.nix index 2408410b2f08b..1f582a43b80ac 100644 --- a/pkgs/desktops/deepin/go-package/startdde/default.nix +++ b/pkgs/desktops/deepin/go-package/startdde/default.nix @@ -5,7 +5,7 @@ , gettext , pkg-config , jq -, wrapGAppsHook +, wrapGAppsHook3 , glib , libgnome-keyring , gtk3 @@ -19,13 +19,13 @@ buildGoModule rec { pname = "startdde"; - version = "6.0.13"; + version = "6.0.14"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-sftPQq4cSyCTuvVtvjT8YJDLQOpSbmnXEVzFwFFaU4U="; + hash = "sha256-2aPQaH78+J18a/SXA2i+gQ5iypsjNhcYaORGN2qkz7c="; }; vendorHash = "sha256-Y81p3yPQayXbvyUI7N6PvFDO3hSU3SL0AuUKxvZkZNE="; @@ -47,7 +47,7 @@ buildGoModule rec { gettext pkg-config jq - wrapGAppsHook + wrapGAppsHook3 glib ]; |