From 34ae6ed370f62c76126bf79fbf6a3f3bd43781ec Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 27 Nov 2024 11:58:26 +0100
Subject: [PATCH] simulide: don't use libsForQt5.callPackage

---
 .../science/electronics/simulide/default.nix  | 31 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/science/electronics/simulide/default.nix b/pkgs/applications/science/electronics/simulide/default.nix
index 717f7b57de74..441b6e4e27b5 100644
--- a/pkgs/applications/science/electronics/simulide/default.nix
+++ b/pkgs/applications/science/electronics/simulide/default.nix
@@ -1,12 +1,8 @@
 {
   lib,
+  stdenv,
   fetchbzr,
-  mkDerivation,
-  qmake,
-  qtserialport,
-  qtmultimedia,
-  qttools,
-  qtscript,
+  libsForQt5,
 }:
 
 let
@@ -24,7 +20,7 @@ let
         cp simulide $out/bin/simulide
       '',
     }:
-    mkDerivation {
+    stdenv.mkDerivation {
       pname = "simulide";
       version = "${version}-${release}";
       inherit src;
@@ -48,13 +44,18 @@ let
         cd build_XX
       '';
 
-      nativeBuildInputs = [ qmake ];
+      nativeBuildInputs = with libsForQt5; [
+        qmake
+        wrapQtAppsHook
+      ];
 
-      buildInputs = [
-        qtserialport
-        qtmultimedia
-        qttools
-      ] ++ extraBuildInputs;
+      buildInputs =
+        (with libsForQt5; [
+          qtserialport
+          qtmultimedia
+          qttools
+        ])
+        ++ extraBuildInputs;
 
       installPhase = ''
         runHook preInstall
@@ -104,7 +105,7 @@ in
       sed -i src/gpsim/value.h -e '1i #include <cstdint>'
       sed -i src/gpsim/modules/watchdog.h -e '1i #include <cstdint>'
     '';
-    extraBuildInputs = [ qtscript ];
+    extraBuildInputs = [ libsForQt5.qtscript ];
     iconPath = "resources/icons/hicolor/256x256/simulide.png"; # upstream had a messed up icon path in this release
     installFiles = ''
       cp -r share/simulide/* $out/share/simulide
@@ -121,7 +122,7 @@ in
       sha256 = "sha256-rJWZvnjVzaKXU2ktbde1w8LSNvu0jWkDIk4dq2l7t5g=";
       inherit rev;
     };
-    extraBuildInputs = [ qtscript ];
+    extraBuildInputs = [ libsForQt5.qtscript ];
   };
 
   simulide_1_1_0 = generic rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b6419813241..df7c22c26302 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17878,7 +17878,7 @@ with pkgs;
 
   appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { };
 
-  inherit (libsForQt5.callPackage ../applications/science/electronics/simulide { })
+  inherit (callPackage ../applications/science/electronics/simulide { })
     simulide_0_4_15 simulide_1_0_0 simulide_1_1_0;
 
   simulide = simulide_1_0_0;