Unverified Commit 162ac432 authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

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

parents 01eb8df5 043347c0

pkgs/applications/networking/remote/x2goclient/default.nix

+3 −2
Original line number Diff line number Diff line 
{ 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";

pkgs/applications/networking/synology-drive-client/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 ];

pkgs/by-name/kg/kgeotag/package.nix

+3 −3
Original line number Diff line number Diff line 
{ 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.6.0";
@@ -12,7 +12,7 @@ libsForQt5.mkDerivation rec { 
    hash = "sha256-lUfU6SHRCglC81BTcVFFOp/psWXsUFOTEPUrZutrJaY=";

  };



  nativeBuildInputs = [ cmake extra-cmake-modules ];

  nativeBuildInputs = [ cmake extra-cmake-modules libsForQt5.wrapQtAppsHook ];



  buildInputs = [ libsForQt5.libkexiv2 libsForQt5.marble ];

pkgs/by-name/ne/neovim-qt/package.nix

+3 −3
Original line number Diff line number Diff line 
{ 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

pkgs/by-name/os/oscar/package.nix

+5 −2
Original line number Diff line number Diff line
@@ -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}"

  '';