commit 71655b0b6946ce98014767957161f93cd69b557d · pyrox.dev/nixpkgs

+6 -4

pkgs/applications/editors/kdevelop/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "${pname}-${version}";

     

       6
       6
       -
         version = "4.7.1";

     

       6
       6
       +
         version = "4.7.3";

     

       7
       7
        
         pname = "kdevelop";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
       -
           url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";

     

       11
       11
       -
           sha256 = "e3ad5377f53739a67216d37cda3f88c03f8fbb0c96e2a9ef4056df3c124e95c1";

     

       10
       10
       +
           url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";

     

       11
       11
       +
           sha256 = "9db388d1c8274da7d168c13db612c7e94ece7815757b945b0aa0371620a06b35";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ kdevplatform kdebase_workspace okteta qjson ];

     
···

       16
       16
        
         nativeBuildInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];

     

       17
       17
        
       

     

       18
       18
        
         propagatedUserEnvPkgs = [ kdevplatform kate konsole kde_runtime oxygen_icons ];

     

       19
       19
       +
       

     

       20
       20
       +
         patches = [ ./gettext.patch ];

     

       19
       21
        
       

     

       20
       22
        
         NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";

     

       21
       23
        
       

     
···

       31
       33
        
               programing languages. It is based on KDevPlatform, KDE and Qt

     

       32
       34
        
               libraries and is under development since 1998.

     

       33
       35
        
             '';

     

       34
       34
       -
           homepage = http://www.kdevelop.org;

     

       36
       36
       +
           homepage = https://www.kdevelop.org;

     

       35
       37
        
         };

     

       36
       38
        
       }

+8

pkgs/applications/editors/kdevelop/gettext.patch

···

       1
       1
       +
       diff -urN kdevelop-4.7.3.orig/po/CMakeLists.txt kdevelop-4.7.3/po/CMakeLists.txt

     

       2
       2
       +
       --- kdevelop-4.7.3.orig/po/CMakeLists.txt	2016-03-04 23:29:09.411886565 +0100

     

       3
       3
       +
       +++ kdevelop-4.7.3/po/CMakeLists.txt	2016-03-04 23:28:35.108451713 +0100

     

       4
       4
       +
       @@ -1,3 +1,4 @@

     

       5
       5
       +
       +cmake_policy(SET CMP0002 OLD)

     

       6
       6
       +
        find_package(Gettext REQUIRED)

     

       7
       7
       +
        if (NOT GETTEXT_MSGMERGE_EXECUTABLE)

     

       8
       8
       +
        MESSAGE(FATAL_ERROR "Please install msgmerge binary")

+6 -9

pkgs/development/libraries/kdevplatform/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchpatch, cmake, kdelibs, subversion, qt4, automoc4, phonon,

     

       1
       1
       +
       { stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, phonon,

     

       2
       2
        
         gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         name = "kdevplatform-1.7.1";

     

       5
       5
       +
         name = "kdevplatform-1.7.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://kde/stable/kdevelop/4.7.1/src/${name}.tar.xz";

     

       9
       9
       -
           sha256 = "dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac";

     

       8
       8
       +
           url = "mirror://kde/stable/kdevelop/4.7.3/src/${name}.tar.bz2";

     

       9
       9
       +
           sha256 = "195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         patches = [(fetchpatch {

     

       13
       13
       -
           name = "svn-1.9.patch";

     

       14
       14
       -
           url = "https://git.reviewboard.kde.org/r/124783/diff/raw/";

     

       15
       15
       -
           sha256 = "1ixll5pvynb3l4znc65d82a5bj2s3c7c7is585s2wdpfzjgl5ay0";

     

       16
       16
       -
         })];

     

       12
       12
       +
         patches = [ ./gettext.patch ];

     

       17
       13
        
       

     

       18
       14
        
         propagatedBuildInputs = [ kdelibs qt4 phonon ];

     

       19
       15
        
         buildInputs = [ apr aprutil subversion boost qjson grantlee ];

     
···

       31
       27
        
             IDE-like programs. It is programing-language independent, and is planned

     

       32
       28
        
             to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc."

     

       33
       29
        
           '';

     

       30
       30
       +
           homepage = https://www.kdevelop.org;

     

       34
       31
        
         };

     

       35
       32
        
       }

+8

pkgs/development/libraries/kdevplatform/gettext.patch

···

       1
       1
       +
       diff -urN kdevplatform-1.7.3.orig/po/CMakeLists.txt kdevplatform-1.7.3/po/CMakeLists.txt

     

       2
       2
       +
       --- kdevplatform-1.7.3.orig/po/CMakeLists.txt	2016-03-04 23:25:30.102112596 +0100

     

       3
       3
       +
       +++ kdevplatform-1.7.3/po/CMakeLists.txt	2016-03-04 23:26:06.242570024 +0100

     

       4
       4
       +
       @@ -1,3 +1,4 @@

     

       5
       5
       +
       +cmake_policy(SET CMP0002 OLD)

     

       6
       6
       +
        find_package(Gettext REQUIRED)

     

       7
       7
       +
        if (NOT GETTEXT_MSGMERGE_EXECUTABLE)

     

       8
       8
       +
        MESSAGE(FATAL_ERROR "Please install msgmerge binary")