From b1718d879a08b5d1f0c80b67ee8e14df7e09e20b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Wed, 3 Mar 2021 01:03:37 +0100 Subject: [PATCH] librepcb: fix use of wrapQtApp (#114891) --- .../science/electronics/librepcb/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 394a1787615..53a67cea40b 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -18,30 +18,25 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; qmakeFlags = ["-r"]; - enableParallelBuilding = true; + + # the build system tries to use 'git' at build time to find the HEAD hash. + # that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment + # at the end of the line to remove the git call. + postPatch = '' + substituteInPlace ./libs/librepcb/common/common.pro \ + --replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # ' + ''; postInstall = '' mkdir -p $out/share/librepcb/fontobene cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/ ''; - # the build system tries to use 'git' at build time to find the HEAD hash. - # that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment - # at the end of the line to remove the git call. - patchPhase = '' - substituteInPlace ./libs/librepcb/common/common.pro \ - --replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # ' - ''; - - preFixup = '' - wrapQtApp $out/bin/librepcb - ''; - meta = with lib; { description = "A free EDA software to develop printed circuit boards"; homepage = "https://librepcb.org/"; maintainers = with maintainers; [ luz thoughtpolice ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; }