From 55d436b1e7f280f8b072758696c28c30dadde853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlys=20Bras=20de=20fer?= Date: Sun, 28 Nov 2021 13:15:32 +0100 Subject: [PATCH 1/2] dockapps.wmsm-app: Avoid segfault in build Fixes #129705 --- .../window-managers/windowmaker/dockapps/wmsm-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix index c201c55dcea5..225e44c21ced 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - preInstall = '' + installPhase = '' runHook preInstall install -d ${placeholder "out"}/bin runHook postInstall From 69f1acd3ecc1b3879275bf4ecb330cdd7f1735bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlys=20Bras=20de=20fer?= Date: Sun, 28 Nov 2021 13:20:38 +0100 Subject: [PATCH 2/2] build-idris-package: Use patchPhase for consistency --- pkgs/development/idris-modules/build-idris-package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index ac0555636be0..7869c2706999 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -36,9 +36,10 @@ stdenv.mkDerivation ({ # Some packages use the style # opts = -i ../../path/to/package # rather than the declarative pkgs attribute so we have to rewrite the path. - postPatch = '' + patchPhase = '' runHook prePatch sed -i ${ipkgName}.ipkg -e "/^opts/ s|-i \\.\\./|-i ${idris-with-packages}/libs/|g" + runHook postPatch ''; buildPhase = ''