From bed8eb86c611207c877d9ed7e42788e502da81d2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Aug 2016 10:00:12 -0500 Subject: [PATCH] kde5.breeze-plymouth: init at 5.7.3 --- .../kde-5/plasma/breeze-plymouth/default.nix | 16 ++++++++++++++++ .../breeze-plymouth/install-paths.patch | 19 +++++++++++++++++++ .../kde-5/plasma/breeze-plymouth/series | 1 + pkgs/desktops/kde-5/plasma/default.nix | 1 + 4 files changed, 37 insertions(+) create mode 100644 pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix create mode 100644 pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch create mode 100644 pkgs/desktops/kde-5/plasma/breeze-plymouth/series diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix b/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix new file mode 100644 index 00000000000..0de1ca1f680 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix @@ -0,0 +1,16 @@ +{ + plasmaPackage, lib, copyPathsToStore, + ecm, + plymouth +}: + +plasmaPackage { + name = "breeze-plymouth"; + nativeBuildInputs = [ ecm ]; + buildInputs = [ plymouth ]; + outputs = [ "out" ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + postPatch = '' + substituteInPlace cmake/FindPlymouth.cmake --subst-var out + ''; +} diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch b/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch new file mode 100644 index 00000000000..5d5856d122d --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch @@ -0,0 +1,19 @@ +Index: breeze-plymouth-5.7.3/cmake/FindPlymouth.cmake +=================================================================== +--- breeze-plymouth-5.7.3.orig/cmake/FindPlymouth.cmake ++++ breeze-plymouth-5.7.3/cmake/FindPlymouth.cmake +@@ -24,12 +24,8 @@ + include(FindPkgConfig) + + pkg_check_modules(Plymouth ply-boot-client ply-splash-core) +-exec_program(${PKG_CONFIG_EXECUTABLE} +- ARGS ply-splash-core --variable=pluginsdir +- OUTPUT_VARIABLE Plymouth_PLUGINSDIR) +-exec_program(${PKG_CONFIG_EXECUTABLE} +- ARGS ply-splash-core --variable=themesdir +- OUTPUT_VARIABLE Plymouth_THEMESDIR) ++set(Plymouth_PLUGINSDIR "@out@/lib/plymouth") ++set(Plymouth_THEMESDIR "@out@/share/plymouth/themes") + + find_package_handle_standard_args(Plymouth + FOUND_VAR diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/series b/pkgs/desktops/kde-5/plasma/breeze-plymouth/series new file mode 100644 index 00000000000..8920e7ca518 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/breeze-plymouth/series @@ -0,0 +1 @@ +install-paths.patch diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index 7aff229b4c1..5a8d148b1b0 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -52,6 +52,7 @@ let name = "breeze-${version}"; paths = map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]; }; + breeze-plymouth = callPackage ./breeze-plymouth {}; kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; kde-cli-tools = callPackage ./kde-cli-tools.nix {}; kde-gtk-config = callPackage ./kde-gtk-config {};