From 8db37160ebd6cf83bc0c79e20659ebbaea103c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 13 Apr 2019 20:09:42 -0300 Subject: [PATCH 1/2] deepin.deepin-screenshot: fix FHS hard coded path --- pkgs/desktops/deepin/deepin-screenshot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix index e595a47b635..54ec4cb62d4 100644 --- a/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs generate_translations.sh fixPath ${deepin-turbo} /usr/bin/deepin-turbo-invoker src/dbusservice/com.deepin.Screenshot.service - fixPath $out/bin/deepin-screenshot /usr/bin/deepin-screenshot src/dbusservice/com.deepin.Screenshot.service + fixPath $out /usr/bin/deepin-screenshot src/dbusservice/com.deepin.Screenshot.service substituteInPlace src/mainwindow.cpp --replace '"xdg-open,%1"' '"${xdg_utils}/bin/xdg-open,%1"' ''; From e4745e83633c1d0609f46bbda6073e73892f19e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 13 Apr 2019 20:23:42 -0300 Subject: [PATCH 2/2] deepin.deepin-screenshot: search FHS hard coded paths (for debuging) --- pkgs/desktops/deepin/deepin-screenshot/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix index 54ec4cb62d4..6585bc78c58 100644 --- a/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -38,12 +38,17 @@ stdenv.mkDerivation rec { ]; postPatch = '' + searchHardCodedPaths patchShebangs generate_translations.sh fixPath ${deepin-turbo} /usr/bin/deepin-turbo-invoker src/dbusservice/com.deepin.Screenshot.service fixPath $out /usr/bin/deepin-screenshot src/dbusservice/com.deepin.Screenshot.service substituteInPlace src/mainwindow.cpp --replace '"xdg-open,%1"' '"${xdg_utils}/bin/xdg-open,%1"' ''; + postFixup = '' + searchHardCodedPaths $out + ''; + passthru.updateScript = deepin.updateScript { inherit name; }; meta = with stdenv.lib; {