From 7c69261980bd5589ad1e50a610bfbdd950a03058 Mon Sep 17 00:00:00 2001 From: Tomo Date: Mon, 14 Oct 2024 16:49:51 +0000 Subject: [PATCH 1/8] qdirstat: use stdenv.mkDerivation Part of #180841 --- pkgs/by-name/qd/qdirstat/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qd/qdirstat/package.nix b/pkgs/by-name/qd/qdirstat/package.nix index e933cafc2e80..04e6ae824f22 100644 --- a/pkgs/by-name/qd/qdirstat/package.nix +++ b/pkgs/by-name/qd/qdirstat/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + stdenv, libsForQt5, coreutils, xdg-utils, @@ -9,7 +10,7 @@ perlPackages, }: -libsForQt5.mkDerivation rec { +stdenv.mkDerivation rec { pname = "qdirstat"; version = "1.9"; @@ -20,7 +21,12 @@ libsForQt5.mkDerivation rec { hash = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU="; }; - nativeBuildInputs = [ makeWrapper ] ++ (with libsForQt5; [ qmake ]); + nativeBuildInputs = + [ makeWrapper ] + ++ (with libsForQt5; [ + qmake + wrapQtAppsHook + ]); buildInputs = [ perlPackages.perl ]; From 1513db9ef98b2b3cb3fbf9daf66691747809dab2 Mon Sep 17 00:00:00 2001 From: Tomo Date: Mon, 14 Oct 2024 16:51:46 +0000 Subject: [PATCH 2/8] kgeotag: use stdenv.mkDerivation Part of #180841 --- pkgs/by-name/kg/kgeotag/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kg/kgeotag/package.nix b/pkgs/by-name/kg/kgeotag/package.nix index c894c991187a..0bae59719e7f 100644 --- a/pkgs/by-name/kg/kgeotag/package.nix +++ b/pkgs/by-name/kg/kgeotag/package.nix @@ -1,6 +1,6 @@ -{ cmake, extra-cmake-modules, fetchFromGitLab, lib, libsForQt5 }: +{ stdenv, cmake, extra-cmake-modules, fetchFromGitLab, lib, libsForQt5 }: -libsForQt5.mkDerivation rec { +stdenv.mkDerivation rec { pname = "kgeotag"; version = "1.5.0"; @@ -12,7 +12,7 @@ libsForQt5.mkDerivation rec { hash = "sha256-G9SyGvoSOL6nsWnMuSIUSFHFUwZUzExBJBkKN46o8GI="; }; - nativeBuildInputs = [ cmake extra-cmake-modules ]; + nativeBuildInputs = [ cmake extra-cmake-modules libsForQt5.wrapQtAppsHook ]; buildInputs = [ libsForQt5.libkexiv2 libsForQt5.marble ]; From 9f0e002ec1bfbd5b41d52fb72c91d5bc3b8c4562 Mon Sep 17 00:00:00 2001 From: Tomo Date: Mon, 14 Oct 2024 16:54:56 +0000 Subject: [PATCH 3/8] r3ctl: use stdenv.mkDerivation --- pkgs/tools/misc/r3ctl/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/r3ctl/default.nix b/pkgs/tools/misc/r3ctl/default.nix index bc0c7837e2a9..df2665dfcf7b 100644 --- a/pkgs/tools/misc/r3ctl/default.nix +++ b/pkgs/tools/misc/r3ctl/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , qt5 , qtbase , qttools @@ -7,7 +8,7 @@ , fetchFromGitHub }: -qt5.mkDerivation { +stdenv.mkDerivation { pname = "r3ctl"; version = "a82cb5b3123224e706835407f21acea9dc7ab0f0"; From 99a939f44252149263531ade3584d3fc700a4396 Mon Sep 17 00:00:00 2001 From: Tomo Date: Mon, 14 Oct 2024 16:55:46 +0000 Subject: [PATCH 4/8] oscar: use stdenv.mkDerivation --- pkgs/by-name/os/oscar/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/os/oscar/package.nix b/pkgs/by-name/os/oscar/package.nix index 1af7233bb20a..cdc9c267327d 100644 --- a/pkgs/by-name/os/oscar/package.nix +++ b/pkgs/by-name/os/oscar/package.nix @@ -5,7 +5,7 @@ fetchFromGitLab, libGLU, }: -qt5.mkDerivation rec { +stdenv.mkDerivation rec { pname = "oscar"; version = "1.5.1"; @@ -22,7 +22,10 @@ qt5.mkDerivation rec { qt5.qtserialport libGLU ]; - nativeBuildInputs = [ qt5.qmake ]; + nativeBuildInputs = [ + qt5.wrapQtAppsHook + qt5.qmake + ]; postPatch = '' substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}" ''; From 989f10b02d3d96f649802be47a048cb7e7ec4ae5 Mon Sep 17 00:00:00 2001 From: Tomo Date: Mon, 14 Oct 2024 16:57:17 +0000 Subject: [PATCH 5/8] synology-drive-client: use stdenv.mkDerivation Part of #180841 --- .../applications/networking/synology-drive-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index fb930edd1447..69f7b4d153c5 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -25,7 +25,7 @@ let update-source-version synology-drive-client "$version" ''; - linux = qt5.mkDerivation { + linux = stdenv.mkDerivation { inherit pname version meta passthru; src = fetchurl { @@ -33,7 +33,7 @@ let sha256 = "sha256-VeS5bPcMM4JDCSH5GXkl4OgQjrPKaNDh5PfX28/zqaU="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook autoPatchelfHook dpkg ]; buildInputs = [ glibc gtk3 pango libxcb ]; From 828accc0e369a21f8ede7b77e98dd93150dfca2c Mon Sep 17 00:00:00 2001 From: Tomo Date: Mon, 14 Oct 2024 16:58:51 +0000 Subject: [PATCH 6/8] neovim-qt: use stdenvNoCC.mkDerivation Also replace `stdenv.hostPlatform.isDarwin` with `stdenvNoCC.hostPlatform.isDarwin`, since no compilation occurs in this package. Part of #180841 --- pkgs/by-name/ne/neovim-qt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/neovim-qt/package.nix b/pkgs/by-name/ne/neovim-qt/package.nix index 6251559eba27..c94c47720106 100644 --- a/pkgs/by-name/ne/neovim-qt/package.nix +++ b/pkgs/by-name/ne/neovim-qt/package.nix @@ -1,12 +1,12 @@ -{ stdenv, libsForQt5, makeWrapper, neovim, neovim-qt-unwrapped }: +{ stdenvNoCC, makeWrapper, neovim, neovim-qt-unwrapped }: let unwrapped = neovim-qt-unwrapped; in -libsForQt5.mkDerivation { +stdenvNoCC.mkDerivation { pname = "neovim-qt"; version = unwrapped.version; - buildCommand = if stdenv.hostPlatform.isDarwin then '' + buildCommand = if stdenvNoCC.hostPlatform.isDarwin then '' mkdir -p $out/Applications cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications From 03fae2ef6911194c83509636fdc7f8b7867a7c33 Mon Sep 17 00:00:00 2001 From: Tomo Date: Mon, 14 Oct 2024 17:06:55 +0000 Subject: [PATCH 7/8] x2goclient: use stdenv.mkDerivation Part of #180841 --- pkgs/applications/networking/remote/x2goclient/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 551f8e57f7a0..a9182b739fbf 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , fetchurl , cups , libssh @@ -15,7 +16,7 @@ , pkg-config }: -qt5.mkDerivation rec { +stdenv.mkDerivation rec { pname = "x2goclient"; version = "4.1.2.2"; From 043347c00cf62f9362cac1550b8b2ae7ccdff613 Mon Sep 17 00:00:00 2001 From: Tomo Date: Mon, 14 Oct 2024 06:59:30 +0000 Subject: [PATCH 8/8] soundwireserver: use stdenvNoCC.mkDerivation and wrapQtAppsHook Part of #180841 --- pkgs/by-name/so/soundwireserver/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/so/soundwireserver/package.nix b/pkgs/by-name/so/soundwireserver/package.nix index 1d04e48129d5..06a93d90af00 100644 --- a/pkgs/by-name/so/soundwireserver/package.nix +++ b/pkgs/by-name/so/soundwireserver/package.nix @@ -1,12 +1,13 @@ { lib, + stdenvNoCC, qt5, autoPatchelfHook, fetchzip, portaudio, }: -qt5.mkDerivation { +stdenvNoCC.mkDerivation { pname = "soundwire"; version = "3.0"; @@ -17,6 +18,7 @@ qt5.mkDerivation { nativeBuildInputs = [ autoPatchelfHook + qt5.wrapQtAppsHook ]; buildInputs = [