Unverified Commit 4552f706 authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

various: use stdenv.mkDerivation instead of qt5.mkDerivation (#483875)

parents e3fd1081 6c99841a

pkgs/applications/audio/lmms/default.nix

+4 −2
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  cmake,

  pkg-config,

  wrapQtAppsHook,

  alsa-lib ? null,

  carla ? null,

  fftwFloat,
@@ -22,10 +24,9 @@ 
  qtx11extras,

  qttools,

  SDL ? null,

  mkDerivation,

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "lmms";

  version = "1.2.2";
@@ -41,6 +42,7 @@ mkDerivation rec { 
    cmake

    qttools

    pkg-config

    wrapQtAppsHook

  ];



  buildInputs = [

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

+4 −2
Original line number Diff line number Diff line 
{

  lib,

  mkDerivation,

  stdenv,

  fetchFromGitHub,

  cmake,

  extra-cmake-modules,

  wrapQtAppsHook,

  qtbase,

  qtquickcontrols2,

  SDL,
@@ -13,7 +14,7 @@ 
  nixosTests,

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "sfxr-qt";

  version = "1.5.1";
@@ -35,6 +36,7 @@ mkDerivation rec { 
        setuptools

      ]

    ))

    wrapQtAppsHook

  ];



  buildInputs = [

pkgs/applications/editors/notepadqq/default.nix

+5 −3
Original line number Diff line number Diff line 
{

  mkDerivation,

  lib,

  stdenv,

  fetchFromGitHub,

  pkg-config,

  which,

  qttools,

  wrapQtAppsHook,

  libuchardet,

  qtbase,

  qtsvg,

  qttools,

  qtwebengine,

  qtwebsockets,

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "notepadqq";

  # shipping a beta build as there's no proper release which supports qtwebengine

  version = "2.0.0-beta";
@@ -34,6 +35,7 @@ mkDerivation rec { 
    pkg-config

    which

    qttools

    wrapQtAppsHook

  ];



  buildInputs = [

pkgs/applications/editors/okteta/default.nix

+4 −2
Original line number Diff line number Diff line 
{

  mkDerivation,

  lib,

  stdenv,

  fetchurl,

  extra-cmake-modules,

  kdoctools,

  wrapQtAppsHook,

  qtscript,

  kconfig,

  kinit,
@@ -17,7 +18,7 @@ 
  shared-mime-info,

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "okteta";

  version = "0.26.24";
@@ -30,6 +31,7 @@ mkDerivation rec { 
    qtscript

    extra-cmake-modules

    kdoctools

    wrapQtAppsHook

  ];

  buildInputs = [ shared-mime-info ];

pkgs/applications/emulators/yabause/default.nix

+4 −2
Original line number Diff line number Diff line 
{

  mkDerivation,

  lib,

  stdenv,

  fetchurl,

  cmake,

  pkg-config,

  wrapQtAppsHook,

  qtbase,

  qt5,

  libGLU,
@@ -13,7 +14,7 @@ 
  SDL2 ? null,

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "yabause";

  version = "0.9.15";
@@ -25,6 +26,7 @@ mkDerivation rec { 
  nativeBuildInputs = [

    cmake

    pkg-config

    wrapQtAppsHook

  ];

  buildInputs = [

    qtbase