From c6b280466880250bc15e95247a2bebe8d77c8482 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 10 Jun 2025 20:43:02 +0400 Subject: [PATCH] doublecmd: modernize --- pkgs/by-name/do/doublecmd/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index ad91a7a80338..12f1e693c23f 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -10,6 +10,7 @@ libX11, libqtpas, wrapQtAppsHook, + writableTmpDirAsHomeHook, }: stdenv.mkDerivation (finalAttrs: { @@ -19,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1rUAyI+Qe4I6F1T9KxMxHxedcARav6CE8W5qvWLu8Y0="; }; @@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { getopt lazarus wrapQtAppsHook + writableTmpDirAsHomeHook ]; buildInputs = [ @@ -42,15 +44,14 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs build.sh install/linux/install.sh substituteInPlace build.sh \ - --replace '$(which lazbuild)' '"${lazarus}/bin/lazbuild --lazarusdir=${lazarus}/share/lazarus"' + --replace-warn '$(which lazbuild)' '"${lazarus}/bin/lazbuild --lazarusdir=${lazarus}/share/lazarus"' substituteInPlace install/linux/install.sh \ - --replace '$DC_INSTALL_PREFIX/usr' '$DC_INSTALL_PREFIX' + --replace-warn '$DC_INSTALL_PREFIX/usr' '$DC_INSTALL_PREFIX' ''; buildPhase = '' runHook preBuild - export HOME=$(mktemp -d) ./build.sh release qt5 runHook postBuild