public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qrencode-3.2.0

Browse Source 
Remove builderDefs magic, add meta

Cherry-pick r31382 from branches/libpng15

svn path=/nixpkgs/trunk/; revision=31385
This commit is contained in:
Yury G. Kudryashov 2012-01-06 23:05:11 +00:00
parent cfc9de7311
commit 1401241864
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/tools/graphics/qrencode/default.nix
View File

@ -1,27 +1,20 @@
args : { stdenv, fetchurl, libpng, pkgconfig }:
let
lib = args.lib; stdenv.mkDerivation rec {
fetchurl = args.fetchurl; name = "qrencode-3.2.0";
version = lib.attrByPath ["version"] "3.0.3" args;
buildInputs = with args; [
libpng pkgconfig
];
in
rec {
src = fetchurl { src = fetchurl {
url = "http://megaui.net/fukuchi/works/qrencode/qrencode-${version}.tar.gz"; url = "${meta.homepage}/${name}.tar.bz2";
sha256 = "1f5nnbk016casqfprdli50ssv08l0gj5zrd0q4rdvzfwqy67i7vm"; sha256 = "13q6cz2lif8d7y95f8sgfqaxc1qr0sz9nl2xh71lfmx7v5ybri03";
}; };
inherit buildInputs; buildInputs = [ libpng ];
configureFlags = []; buildNativeInputs = [ pkgconfig ];
/* doConfigure should be specified separately */
phaseNames = ["doConfigure" "doMakeInstall"];
name = "qrencode-" + version;
meta = { meta = {
homepage = http://fukuchi.org/works/qrencode/;
description = "QR code encoder"; description = "QR code encoder";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.urkud ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -6859,9 +6859,7 @@ let
opencv = opencv_2_1; opencv = opencv_2_1;
}; };
qrencode = builderDefsPackage (import ../tools/graphics/qrencode) { qrencode = callPackage ../tools/graphics/qrencode { };
inherit libpng pkgconfig;
};
gecko_mediaplayer = callPackage ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer { gecko_mediaplayer = callPackage ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer {
inherit (gnome) GConf; inherit (gnome) GConf;