diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-18 12:55:19 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-24 16:49:00 -0600 |
commit | eedbb61eb3a48bc4a3ceeb3e688291d3fc168ecc (patch) | |
tree | 4ee6bffe4bc6e3079fd2e091dd8540355826d4f5 /pkgs/tools | |
parent | d237f44928e8e7a6bec3d6efca0cd36de7870c9f (diff) |
Remove kde4.colord-kde4
- Already updated to KDE 5 in Nixpkgs
- Not useful without the KDE 4 desktop
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/colord-kde/0.5.nix | 30 | ||||
-rw-r--r-- | pkgs/tools/misc/colord-kde/default.nix | 36 | ||||
-rw-r--r-- | pkgs/tools/misc/colord-kde/fix_check_include_files.patch | 9 |
3 files changed, 20 insertions, 55 deletions
diff --git a/pkgs/tools/misc/colord-kde/0.5.nix b/pkgs/tools/misc/colord-kde/0.5.nix deleted file mode 100644 index 0c8e9d6bceef..000000000000 --- a/pkgs/tools/misc/colord-kde/0.5.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 52e1845b300f..0c8e9d6bceef 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -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 ]; }; } diff --git a/pkgs/tools/misc/colord-kde/fix_check_include_files.patch b/pkgs/tools/misc/colord-kde/fix_check_include_files.patch deleted file mode 100644 index 16d14a6a647a..000000000000 --- a/pkgs/tools/misc/colord-kde/fix_check_include_files.patch +++ /dev/null @@ -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})
\ No newline at end of file |