nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-19 18:44:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: remove qt5.mkDerivation usage (trivial cases) (#348577)

Browse Source
This commit is contained in:
Robert Hensing 2024-10-18 11:40:19 +02:00 committed by GitHub
commit 162ac4324d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/networking/remote/x2goclient/default.nix
View File

@ -1,4 +1,5 @@
{ lib { stdenv
, lib
, fetchurl , fetchurl
, cups , cups
, libssh , libssh
@ -15,7 +16,7 @@
, pkg-config , pkg-config
}: }:
qt5.mkDerivation rec { stdenv.mkDerivation rec {
pname = "x2goclient"; pname = "x2goclient";
version = "4.1.2.2"; version = "4.1.2.2";

4
pkgs/applications/networking/synology-drive-client/default.nix
View File

@ -25,7 +25,7 @@ let
update-source-version synology-drive-client "$version" update-source-version synology-drive-client "$version"
''; '';
linux = qt5.mkDerivation { linux = stdenv.mkDerivation {
inherit pname version meta passthru; inherit pname version meta passthru;
src = fetchurl { src = fetchurl {
@ -33,7 +33,7 @@ let
sha256 = "sha256-VeS5bPcMM4JDCSH5GXkl4OgQjrPKaNDh5PfX28/zqaU="; sha256 = "sha256-VeS5bPcMM4JDCSH5GXkl4OgQjrPKaNDh5PfX28/zqaU=";
}; };
nativeBuildInputs = [ autoPatchelfHook dpkg ]; nativeBuildInputs = [ qt5.wrapQtAppsHook autoPatchelfHook dpkg ];
buildInputs = [ glibc gtk3 pango libxcb ]; buildInputs = [ glibc gtk3 pango libxcb ];

6
pkgs/by-name/kg/kgeotag/package.nix
View File

@ -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"; pname = "kgeotag";
version = "1.6.0"; version = "1.6.0";
@ -12,7 +12,7 @@ libsForQt5.mkDerivation rec {
hash = "sha256-lUfU6SHRCglC81BTcVFFOp/psWXsUFOTEPUrZutrJaY="; hash = "sha256-lUfU6SHRCglC81BTcVFFOp/psWXsUFOTEPUrZutrJaY=";
}; };
nativeBuildInputs = [ cmake extra-cmake-modules ]; nativeBuildInputs = [ cmake extra-cmake-modules libsForQt5.wrapQtAppsHook ];
buildInputs = [ libsForQt5.libkexiv2 libsForQt5.marble ]; buildInputs = [ libsForQt5.libkexiv2 libsForQt5.marble ];

6
pkgs/by-name/ne/neovim-qt/package.nix
View File

@ -1,12 +1,12 @@
{ stdenv, libsForQt5, makeWrapper, neovim, neovim-qt-unwrapped }: { stdenvNoCC, makeWrapper, neovim, neovim-qt-unwrapped }:
let let
unwrapped = neovim-qt-unwrapped; unwrapped = neovim-qt-unwrapped;
in in
libsForQt5.mkDerivation { stdenvNoCC.mkDerivation {
pname = "neovim-qt"; pname = "neovim-qt";
version = unwrapped.version; version = unwrapped.version;
buildCommand = if stdenv.hostPlatform.isDarwin then '' buildCommand = if stdenvNoCC.hostPlatform.isDarwin then ''
mkdir -p $out/Applications mkdir -p $out/Applications
cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications

7
pkgs/by-name/os/oscar/package.nix
View File

@ -5,7 +5,7 @@
fetchFromGitLab, fetchFromGitLab,
libGLU, libGLU,
}: }:
qt5.mkDerivation rec { stdenv.mkDerivation rec {
pname = "oscar"; pname = "oscar";
version = "1.5.1"; version = "1.5.1";
@ -22,7 +22,10 @@ qt5.mkDerivation rec {
qt5.qtserialport qt5.qtserialport
libGLU libGLU
]; ];
nativeBuildInputs = [ qt5.qmake ]; nativeBuildInputs = [
qt5.wrapQtAppsHook
qt5.qmake
];
postPatch = '' postPatch = ''
substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}" substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}"
''; '';

10
pkgs/by-name/qd/qdirstat/package.nix
View File

@ -1,6 +1,7 @@
{ {
lib, lib,
fetchFromGitHub, fetchFromGitHub,
stdenv,
libsForQt5, libsForQt5,
coreutils, coreutils,
xdg-utils, xdg-utils,
@ -9,7 +10,7 @@
perlPackages, perlPackages,
}: }:
libsForQt5.mkDerivation rec { stdenv.mkDerivation rec {
pname = "qdirstat"; pname = "qdirstat";
version = "1.9"; version = "1.9";
@ -20,7 +21,12 @@ libsForQt5.mkDerivation rec {
hash = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU="; hash = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU=";
}; };
nativeBuildInputs = [ makeWrapper ] ++ (with libsForQt5; [ qmake ]); nativeBuildInputs =
[ makeWrapper ]
++ (with libsForQt5; [
qmake
wrapQtAppsHook
]);
buildInputs = [ perlPackages.perl ]; buildInputs = [ perlPackages.perl ];

4
pkgs/by-name/so/soundwireserver/package.nix
View File

@ -1,12 +1,13 @@
{ {
lib, lib,
stdenvNoCC,
qt5, qt5,
autoPatchelfHook, autoPatchelfHook,
fetchzip, fetchzip,
portaudio, portaudio,
}: }:
qt5.mkDerivation { stdenvNoCC.mkDerivation {
pname = "soundwire"; pname = "soundwire";
version = "3.0"; version = "3.0";
@ -17,6 +18,7 @@ qt5.mkDerivation {
nativeBuildInputs = [ nativeBuildInputs = [
autoPatchelfHook autoPatchelfHook
qt5.wrapQtAppsHook
]; ];
buildInputs = [ buildInputs = [

5
pkgs/tools/misc/r3ctl/default.nix
View File

@ -1,4 +1,5 @@
{ lib { stdenv
, lib
, qt5 , qt5
, qtbase , qtbase
, qttools , qttools
@ -7,7 +8,7 @@
, fetchFromGitHub , fetchFromGitHub
}: }:
qt5.mkDerivation { stdenv.mkDerivation {
pname = "r3ctl"; pname = "r3ctl";
version = "a82cb5b3123224e706835407f21acea9dc7ab0f0"; version = "a82cb5b3123224e706835407f21acea9dc7ab0f0";