Author: urkud Date: 2010-07-04 20:59:47 +0000 (Sun, 04 Jul 2010) New Revision: 22451
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22451&view=rev Added: nixpkgs/trunk/pkgs/development/libraries/qjson/ nixpkgs/trunk/pkgs/development/libraries/qjson/default.nix Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: Add qjson Changes: Added: nixpkgs/trunk/pkgs/development/libraries/qjson/default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/libraries/qjson/default.nix (rev 0) +++ nixpkgs/trunk/pkgs/development/libraries/qjson/default.nix 2010-07-04 20:59:47 UTC (rev 22451) @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, cmake, qt4 }: + +stdenv.mkDerivation rec { + name = "qjson-0.7.1"; + + src = fetchurl { + url = "mirror://sf/qjson/${name}.tar.bz2"; + sha256 = "155r7nypgnsvjc6w3q51zmjchpqxi4c3azad9cf1fip8bws993iv"; + }; + + buildInputs = [ cmake qt4 ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.urkud ]; + inherit (qt4.meta) platforms; + }; +} Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-07-04 20:55:50 UTC (rev 22450) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-07-04 20:59:47 UTC (rev 22451) @@ -5162,6 +5162,10 @@ inherit fetchurl stdenv; }; + qjson = makeOverridable (import ../development/libraries/qjson) { + inherit stdenv fetchurl qt4 cmake; + }; + qt3 = makeOverridable (import ../development/libraries/qt-3) { inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa; inherit (xlibs) xextproto libXft libXrender libXrandr randrproto _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
