Merge pull request #68144 from fgaz/fgaz/remove-qt-stdenv

Switch my qt packages to qt-specific mkDerivation

pkgs/applications/audio/sfxr-qt/default.nix

@@ -1,11 +1,14 @@
-{ stdenv, fetchFromGitHub
+{ lib
+, mkDerivation
+, fetchFromGitHub
 , cmake
-, qtbase, qtquickcontrols2
+, qtbase
+, qtquickcontrols2
 , SDL
 , python3
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "sfxr-qt";
   version = "1.2.0";
   src = fetchFromGitHub {
@@ -20,12 +23,13 @@ stdenv.mkDerivation rec {
     (python3.withPackages (pp: with pp; [ pyyaml jinja2 ]))
   ];
   buildInputs = [
-    qtbase qtquickcontrols2
+    qtbase
+    qtquickcontrols2
     SDL
   ];
   configurePhase = "cmake . -DCMAKE_INSTALL_PREFIX=$out";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/agateau/sfxr-qt;
     description = "A sound effect generator, QtQuick port of sfxr";
     license = licenses.gpl2;

pkgs/applications/graphics/drawpile/default.nix

@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, mkDerivation
 , fetchurl
 , cmake
 , extra-cmake-modules
@@ -31,7 +32,7 @@
 , enableKisTablet ? false # enable improved graphics tablet support
 }:
 
-with stdenv.lib;
+with lib;
 
 let
   commonDeps = [
@@ -57,7 +58,7 @@ let
     qtx11extras
   ];
 
-in stdenv.mkDerivation rec {
+in mkDerivation rec {
   pname = "drawpile";
   version = "2.1.11";