diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 31c998048de9..e9838739133c 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -43,8 +43,6 @@ recurseIntoAttrs rec { soprano = callPackage ./support/soprano { }; - qimageblitz = callPackage ./support/qimageblitz { }; - ### LIBS kdelibs = callPackage ./libs { }; diff --git a/pkgs/desktops/kde-4.6/default.nix b/pkgs/desktops/kde-4.6/default.nix index 2e7704dfe082..3d882f81bcee 100644 --- a/pkgs/desktops/kde-4.6/default.nix +++ b/pkgs/desktops/kde-4.6/default.nix @@ -42,8 +42,6 @@ rec { soprano = callPackage ./support/soprano { }; - qimageblitz = callPackage ./support/qimageblitz { }; - ### LIBS kdelibs = callPackage ./libs { }; diff --git a/pkgs/desktops/kde-4.6/support/qimageblitz/default.nix b/pkgs/desktops/kde-4.6/support/qimageblitz/default.nix deleted file mode 100644 index bb3d0220b432..000000000000 --- a/pkgs/desktops/kde-4.6/support/qimageblitz/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, lib, cmake, qt4}: - -let - pn = "qimageblitz"; - v = "0.0.4"; -in - -stdenv.mkDerivation { - name = "${pn}-${v}"; - src = fetchurl { - url = "mirror://sf/${pn}/${pn}-${v}.tar.bz2"; - sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9"; - }; - buildInputs = [ cmake qt4 ]; - - meta = { - description = "Graphical effect and filter library for KDE4"; - license = "BSD"; - homepage = "http://${pn}.sourceforge.net"; - }; -} diff --git a/pkgs/desktops/kde-4.5/support/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix similarity index 100% rename from pkgs/desktops/kde-4.5/support/qimageblitz/default.nix rename to pkgs/development/libraries/qimageblitz/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9f209ea5315..d7a5981256c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3982,6 +3982,8 @@ let qca2_ossl = callPackage ../development/libraries/qca2/ossl.nix {}; + qimageblitz = callPackage ../development/libraries/qimageblitz {}; + qjson = callPackage ../development/libraries/qjson { }; qt3 = callPackage ../development/libraries/qt-3 {