Merge branch 'staging'

2014-12-08 16:28:45 +01:00
parent 0b1d16cff2 9d86b4683d
commit de99c9c955
130 changed files with 1172 additions and 2041 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kdelibs, polkit_qt_1, gettext }:
+{ stdenv, fetchurl, kdelibs, polkit_qt4, gettext }:

 stdenv.mkDerivation rec {
  name = "polkit-kde-agent-1-0.99.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "0rxlq6x0vhvha8i6w109zpzzacp4imins55v4p4fq7a3k0kgywg3";
  };

-  buildInputs = [ kdelibs polkit_qt_1 ];
+  buildInputs = [ kdelibs polkit_qt4 ];

  nativeBuildInputs = [ gettext ];