From aadd5b3f55cf81ddb1b5d0d2a65f897ffd0eb880 Mon Sep 17 00:00:00 2001 From: Matthias Devlamynck Date: Tue, 4 Sep 2018 16:59:15 +0200 Subject: [PATCH] plasma-applet-volumewin7mixer: init at v23 --- maintainers/maintainer-list.nix | 5 ++++ .../plasma-applet-volumewin7mixer/cmake.patch | 20 ++++++++++++++ .../plasma-applet-volumewin7mixer/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 53 insertions(+) create mode 100644 pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch create mode 100644 pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6356c0c7cef..5dee165a930 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2531,6 +2531,11 @@ github = "mdaiter"; name = "Matthew S. Daiter"; }; + mdevlamynck = { + email = "matthias.devlamynck@mailoo.org"; + github = "mdevlamynck"; + name = "Matthias Devlamynck"; + }; meditans = { email = "meditans@gmail.com"; github = "meditans"; diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch b/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch new file mode 100644 index 00000000000..b33a3e174bc --- /dev/null +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch @@ -0,0 +1,20 @@ +diff -Naur org.kde.plasma.volumewin7mixer/CMakeLists.txt org.kde.plasma.volumewin7mixer.patch/CMakeLists.txt +--- org.kde.plasma.volumewin7mixer/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ org.kde.plasma.volumewin7mixer.patch/CMakeLists.txt 2016-04-19 11:23:35.137866949 +0200 +@@ -0,0 +1,15 @@ ++# Set minimum CMake version (required for CMake 3.0 or later) ++cmake_minimum_required(VERSION 2.8.12) ++ ++# Use Extra CMake Modules (ECM) for common functionality. ++# See http://api.kde.org/ecm/manual/ecm.7.html ++# and http://api.kde.org/ecm/manual/ecm-kde-modules.7.html ++find_package(ECM REQUIRED NO_MODULE) ++# Needed by find_package(KF5Plasma) below. ++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PATH}) ++ ++# Locate plasma_install_package macro. ++find_package(KF5Plasma REQUIRED) ++ ++# Add installatation target ("make install"). ++plasma_install_package(package org.kde.plasma.volumewin7mixer) + diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix new file mode 100644 index 00000000000..6c23d160f47 --- /dev/null +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -0,0 +1,26 @@ +{ stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, plasma-pa, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "plasma-applet-volumewin7mixer-${version}"; + version = "23"; + + src = fetchFromGitHub { + owner = "Zren"; + repo = "plasma-applet-volumewin7mixer"; + rev = "v${version}"; + sha256 = "1j2bq343lnhwqz26qfsvg7vjxv84ibzbc4y86rjkh07nqjwb3xsc"; + }; + + patches = [ ./cmake.patch ]; + postPatch = '' rm build ''; + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ plasma-framework kwindowsystem plasma-pa ]; + + meta = with stdenv.lib; { + description = "A fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)."; + homepage = "https://github.com/Zren/plasma-applet-volumewin7mixer"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mdevlamynck ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8ff605bbd0..f12c83eec37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20470,6 +20470,8 @@ with pkgs; pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { }; }; + plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; + redshift = callPackage ../applications/misc/redshift { inherit (python3Packages) python pygobject3 pyxdg wrapPython; inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;