From 7f84ad5f4c4a2aac98ebb2f4a37a02915e357939 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 25 Feb 2017 13:35:00 -0600 Subject: plasma5: Move to desktops/plasma-5 --- pkgs/desktops/plasma-5/breeze-plymouth/default.nix | 16 ++++++++++++++++ .../plasma-5/breeze-plymouth/install-paths.patch | 19 +++++++++++++++++++ pkgs/desktops/plasma-5/breeze-plymouth/series | 1 + 3 files changed, 36 insertions(+) create mode 100644 pkgs/desktops/plasma-5/breeze-plymouth/default.nix create mode 100644 pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch create mode 100644 pkgs/desktops/plasma-5/breeze-plymouth/series (limited to 'pkgs/desktops/plasma-5/breeze-plymouth') diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix new file mode 100644 index 000000000000..0de1ca1f6802 --- /dev/null +++ b/pkgs/desktops/plasma-5/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/plasma-5/breeze-plymouth/install-paths.patch b/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch new file mode 100644 index 000000000000..5d5856d122dd --- /dev/null +++ b/pkgs/desktops/plasma-5/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/plasma-5/breeze-plymouth/series b/pkgs/desktops/plasma-5/breeze-plymouth/series new file mode 100644 index 000000000000..8920e7ca5189 --- /dev/null +++ b/pkgs/desktops/plasma-5/breeze-plymouth/series @@ -0,0 +1 @@ +install-paths.patch -- cgit 1.4.1