MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove kde4.colord-kde4

Browse source 
- Already updated to KDE 5 in Nixpkgs
- Not useful without the KDE 4 desktop
This commit is contained in:
Thomas Tuegel 2017-02-18 12:55:19 -06:00
parent d237f44928
commit eedbb61eb3
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
4 changed files with 21 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkgs/tools/misc/colord-kde/0.5.nix
View file

@ -1,30 +0,0 @@
{ stdenv, lib, fetchurl
, extra-cmake-modules, ki18n
, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
, kitemviews, lcms2, libXrandr, qtx11extras
}:
stdenv.mkDerivation rec {
name = "colord-kde-${version}";
version = "0.5.0";
src = fetchurl {
url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz";
sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
};
nativeBuildInputs = [ extra-cmake-modules ki18n ];
buildInputs = [
kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
kcmutils kio knotifications plasma-framework kwidgetsaddons
kwindowsystem kitemviews lcms2 libXrandr qtx11extras
];
meta = with lib; {
homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ttuegel ];
};
}

36
pkgs/tools/misc/colord-kde/default.nix
View file

@ -1,26 +1,30 @@
{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
, colord, libX11, libXrandr, lcms2, kdelibs
{ stdenv, lib, fetchurl
, extra-cmake-modules, ki18n
, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
, kitemviews, lcms2, libXrandr, qtx11extras
}:
stdenv.mkDerivation {
name = "colord-kde-0.3.0";
stdenv.mkDerivation rec {
name = "colord-kde-${version}";
version = "0.5.0";
src = fetchurl {
url = http://download.kde.org/stable/colord-kde/0.3.0/src/colord-kde-0.3.0.tar.bz2;
sha256 = "ab3cdb7c8c98aa2ee8de32a92f87770e1fbd58eade6471f3f24d932b50b4cf09";
url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz";
sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
};
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
nativeBuildInputs = [ extra-cmake-modules ki18n ];
buildInputs = [ colord libX11 libXrandr lcms2 kdelibs ];
buildInputs = [
kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
kcmutils kio knotifications plasma-framework kwidgetsaddons
kwindowsystem kitemviews lcms2 libXrandr qtx11extras
];
patches = [ ./fix_check_include_files.patch ];
patchFlags = [ "-p0" ];
enableParallelBuilding = true;
meta = {
description = "A colord front-end for KDE";
license = stdenv.lib.licenses.gpl2Plus;
meta = with lib; {
homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ttuegel ];
};
}

9
pkgs/tools/misc/colord-kde/fix_check_include_files.patch
View file

@ -1,9 +0,0 @@
--- CMakeLists.txt.orig 2013-05-01 05:04:34.000000000 +1000
+++ CMakeLists.txt 2015-12-10 20:43:51.351800988 +1100
@@ -9,6 +9,7 @@
include(FindPkgConfig)
include(KDE4Defaults)
+include(CheckIncludeFiles)
include(ConfigureChecks.cmake)
message(STATUS "X randr is required, found: " ${XRANDR_1_3_FOUND})

4
pkgs/top-level/all-packages.nix
View file

@ -746,7 +746,7 @@ with pkgs;
clib = callPackage ../tools/package-management/clib { };
colord-kde = qt5.callPackage ../tools/misc/colord-kde/0.5.nix {};
colord-kde = qt5.callPackage ../tools/misc/colord-kde {};
consul = callPackage ../servers/consul { };
@ -16713,8 +16713,6 @@ with pkgs;
choqok = callPackage ../applications/networking/instant-messengers/choqok { };
colord-kde = callPackage ../tools/misc/colord-kde { };
eventlist = callPackage ../applications/office/eventlist {};
k3b-original = lowPrio (callPackage ../applications/misc/k3b { });