diff options
| author | c0bw3b <c0bw3b@users.noreply.github.com> | 2019-11-24 17:15:06 +0100 |
|---|---|---|
| committer | c0bw3b <c0bw3b@users.noreply.github.com> | 2019-11-24 17:15:06 +0100 |
| commit | 910d752579772182051b8bcb4c32a0bc120d5b1c (patch) | |
| tree | 3acca19aaba0ae37d394e44fe77daffb44b13a2f /pkgs | |
| parent | 195c263a812dec532656dcfd5d0360458cdc93fd (diff) | |
| download | nixpkgs-910d752579772182051b8bcb4c32a0bc120d5b1c.tar nixpkgs-910d752579772182051b8bcb4c32a0bc120d5b1c.tar.gz nixpkgs-910d752579772182051b8bcb4c32a0bc120d5b1c.tar.bz2 nixpkgs-910d752579772182051b8bcb4c32a0bc120d5b1c.tar.lz nixpkgs-910d752579772182051b8bcb4c32a0bc120d5b1c.tar.xz nixpkgs-910d752579772182051b8bcb4c32a0bc120d5b1c.tar.zst nixpkgs-910d752579772182051b8bcb4c32a0bc120d5b1c.zip | |
kde2-decoration: 2017-03-15 -> 1.0
+ move under data/themes
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/data/themes/kde2/default.nix (renamed from pkgs/misc/themes/kde2/default.nix) | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix index fac8c38eeca..547e4f30aa6 100644 --- a/pkgs/misc/themes/kde2/default.nix +++ b/pkgs/data/themes/kde2/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchFromGitHub, mkDerivation +{ lib, fetchFromGitHub, mkDerivation , cmake, extra-cmake-modules -, qtbase, kcoreaddons, kdecoration }: +, qtbase, kcoreaddons, kdecoration +}: -let - version = "2017-03-15"; -in mkDerivation rec { +mkDerivation rec { pname = "kde2-decoration"; - inherit version; + version = "1.0"; src = fetchFromGitHub { owner = "repos-holder"; repo = "kdecoration2-kde2"; - rev = "2a9cf18ac0646b3532d4db2dd28bd73c4c229783"; - sha256 = "0kilw6sd3blvm6gx9w4w5ivkjfxlv6wnyivw46pwwvhgxqymkbxk"; + rev = version; + sha256 = "1766z9wscybcqvr828xih93b3rab3hb0ghsf818iflhp1xy0js08"; }; enableParallelBuilding = true; @@ -21,9 +20,9 @@ in mkDerivation rec { buildInputs = [ qtbase kcoreaddons kdecoration ]; - meta = with stdenv.lib; { + meta = with lib; { description = "KDE 2 window decoration ported to Plasma 5"; - homepage = src.meta.homepage; + homepage = "https://github.com/repos-holder/kdecoration2-kde2"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ gnidorah ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a738cd4bf41..8294d228202 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4288,8 +4288,6 @@ in kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; - kde2-decoration = libsForQt5.callPackage ../misc/themes/kde2 { }; - keepalived = callPackage ../tools/networking/keepalived { }; kexectools = callPackage ../os-specific/linux/kexectools { }; @@ -17315,6 +17313,8 @@ in kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; + kde2-decoration = libsForQt5.callPackage ../data/themes/kde2 { }; + kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; |