From 4adc607b77d623ecd6b545b75435e455ae9382ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Wed, 10 Apr 2024 21:10:05 +0000 Subject: [PATCH] potreeconverter: Don't unnecessarily override patchPhase/fixupPhase. Overriding `patchPhase` makes declaring or overriding `patches = [...]` have no effect. --- pkgs/applications/graphics/potreeconverter/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/potreeconverter/default.nix b/pkgs/applications/graphics/potreeconverter/default.nix index cc63cbe289b6..ae7acec3522f 100644 --- a/pkgs/applications/graphics/potreeconverter/default.nix +++ b/pkgs/applications/graphics/potreeconverter/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cmake ]; - patchPhase = '' + postPatch = '' runHook prePatch substituteInPlace ./CMakeLists.txt \ @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { # prevent inheriting permissions from /nix/store when copying substituteInPlace Converter/src/main.cpp --replace \ 'fs::copy(templateDir, pagedir, fs::copy_options::overwrite_existing | fs::copy_options::recursive)' 'string cmd = "cp --no-preserve=mode -r " + templateDir + " " + pagedir; system(cmd.c_str());' - - runHook postPatch ''; + # The upstream build system does not provide an install target. installPhase = '' runHook preInstall + mkdir -p $out/{bin,lib} mv liblaszip.so $out/lib mv PotreeConverter $out/bin @@ -56,10 +56,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; - fixupPhase = '' - runHook preFixup + postFixup = '' ln -s $src/resources $out/bin/resources - runHook postFixup ''; meta = with lib; {