krusader: 2.4.0-beta1 -> 2.6.0

Fixes #22952
This commit is contained in:
Peter Hoeg
2017-05-11 18:13:39 +08:00
parent b07e04882e
commit 9498f5ca5f
2 changed files with 30 additions and 18 deletions
+29 -17
View File
@@ -1,21 +1,33 @@
{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig {
, kdelibs4, kde_baseapps kdeDerivation, kdeWrapper, fetchurl, lib,
extra-cmake-modules, kdoctools,
kconfig, kinit, kparts
}: }:
stdenv.mkDerivation rec { let
name = "krusader-2.4.0-beta1"; pname = "krusader";
src = fetchurl { version = "2.6.0";
url = "mirror://sourceforge/krusader/${name}.tar.bz2"; unwrapped = kdeDerivation rec {
sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6"; name = "krusader-${version}";
};
buildInputs = [ kdelibs4 kde_baseapps ]; src = fetchurl {
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh";
meta = { };
description = "Norton/Total Commander clone for KDE";
license = "GPL"; meta = with lib; {
homepage = http://www.krusader.org; description = "Norton/Total Commander clone for KDE";
maintainers = with stdenv.lib.maintainers; [ sander ]; license = licenses.gpl2;
inherit (kdelibs4.meta) platforms; homepage = http://www.krusader.org;
maintainers = with maintainers; [ sander ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kconfig kinit kparts ];
enableParallelBuilding = true;
}; };
in kdeWrapper {
inherit unwrapped;
targets = [ "bin/krusader" ];
} }
+1 -1
View File
@@ -14547,7 +14547,7 @@ with pkgs;
openjpeg = openjpeg_1; openjpeg = openjpeg_1;
}; };
krusader = kde4.callPackage ../applications/misc/krusader { }; krusader = libsForQt5.callPackage ../applications/misc/krusader { };
ksuperkey = callPackage ../tools/X11/ksuperkey { }; ksuperkey = callPackage ../tools/X11/ksuperkey { };