qt5: move kdeDerivation to qt5.mkDerivation
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
{
|
||||
kdeDerivation, kdeWrapper, fetchurl, lib,
|
||||
mkDerivation, kdeWrapper, fetchurl, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kconfig, kinit
|
||||
}:
|
||||
@@ -7,7 +7,7 @@
|
||||
let
|
||||
pname = "kronometer";
|
||||
version = "2.1.3";
|
||||
unwrapped = kdeDerivation rec {
|
||||
unwrapped = mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ kdeDerivation, kdeWrapper, fetchurl, lib
|
||||
, ecm, kdoctools
|
||||
{ mkDerivation, kdeWrapper, fetchurl, lib
|
||||
, extra-cmake-modules, kdoctools
|
||||
, kconfig, kinit, kpmcore
|
||||
, eject, libatasmart }:
|
||||
|
||||
let
|
||||
pname = "partitionmanager";
|
||||
unwrapped = kdeDerivation rec {
|
||||
unwrapped = mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "3.0.1";
|
||||
|
||||
@@ -19,11 +19,10 @@ let
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
nativeBuildInputs = [ ecm kdoctools ];
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
# refer to kpmcore for the use of eject
|
||||
buildInputs = [ eject libatasmart ];
|
||||
propagatedBuildInputs = [ kconfig kinit kpmcore ];
|
||||
enableParallelBuilding = true;
|
||||
};
|
||||
|
||||
in kdeWrapper {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
kdeDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
|
||||
mkDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
|
||||
}:
|
||||
@@ -13,7 +13,7 @@ let
|
||||
rev = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7";
|
||||
sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr";
|
||||
};
|
||||
unwrapped = kdeDerivation rec {
|
||||
unwrapped = mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
kdeDerivation, kdeWrapper, lib, fetchgit, fetchpatch,
|
||||
mkDerivation, lib, kdeWrapper, fetchgit, fetchpatch,
|
||||
extra-cmake-modules, kdoctools, kconfig, kinit, kparts
|
||||
}:
|
||||
|
||||
let
|
||||
unwrapped = kdeDerivation rec {
|
||||
unwrapped = mkDerivation rec {
|
||||
name = "kdiff3-${version}";
|
||||
version = "1.7.0-2017-02-19";
|
||||
|
||||
@@ -34,8 +34,6 @@ let
|
||||
|
||||
propagatedBuildInputs = [ kconfig kinit kparts ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = http://kdiff3.sourceforge.net/;
|
||||
license = licenses.gpl2Plus;
|
||||
|
||||
Reference in New Issue
Block a user