From 9950899236f8530633a4d52c0dffb461365ed8a0 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 17:07:41 +0100 Subject: [PATCH] xflr5: migrate to Qt5.15 rewrite without wrapQtAppsHook and stdenv --- pkgs/applications/science/physics/xflr5/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix index b2e5284796f..5ae56528f96 100644 --- a/pkgs/applications/science/physics/xflr5/default.nix +++ b/pkgs/applications/science/physics/xflr5/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, wrapQtAppsHook, qmake }: +{ mkDerivation, lib, fetchurl, qmake }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "xflr5"; version = "6.47"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ qmake wrapQtAppsHook ]; + nativeBuildInputs = [ qmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An analysis tool for airfoils, wings and planes"; homepage = https://sourceforge.net/projects/xflr5/; license = licenses.gpl3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa30d5d1be3..aa3845c639f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26591,7 +26591,7 @@ in xfitter = callPackage ../applications/science/physics/xfitter {}; - xflr5 = libsForQt514.callPackage ../applications/science/physics/xflr5 { }; + xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; ### SCIENCE/PROGRAMMING