From 51c6082a9fc2042b7aa0eda9a9365d4a3b604575 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 4 Oct 2019 15:24:16 +0200 Subject: [PATCH] openscad: remove useless preBuild phase The preBuild phase was introduced to follow a modification in qscintilla build (76ad2796be28c5fbe8f8fe2b9bada12c3e1360e2) that forced the library libqscintilla2_qt5.so to be called libqscintilla2.so. This has been inproved in 4bf49d94179ad2378f50ba54138343fecb75e446 so the preBuild trick is not necessary anymore. --- pkgs/applications/graphics/openscad/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 9910b7bbadf2..9f7fbc8421ba 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -53,10 +53,6 @@ mkDerivation rec { # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory enableParallelBuilding = false; # true by default due to qmake - preBuild = '' - sed -re 's/qscintilla2_qt5/qscintilla2/g' -i Makefile - ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir $out/Applications mv $out/bin/*.app $out/Applications