diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-06 23:05:11 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-06 23:05:11 +0000 |
| commit | 1401241864c48ebab0f3b8c2df446e0c3ba4a720 (patch) | |
| tree | 1ef32c3d7f2c8026ab8b345fc606deaca20ff217 | |
| parent | cfc9de7311a0209245e627f12cdd6743a16ba99b (diff) | |
| download | nixlib-1401241864c48ebab0f3b8c2df446e0c3ba4a720.tar nixlib-1401241864c48ebab0f3b8c2df446e0c3ba4a720.tar.gz nixlib-1401241864c48ebab0f3b8c2df446e0c3ba4a720.tar.bz2 nixlib-1401241864c48ebab0f3b8c2df446e0c3ba4a720.tar.lz nixlib-1401241864c48ebab0f3b8c2df446e0c3ba4a720.tar.xz nixlib-1401241864c48ebab0f3b8c2df446e0c3ba4a720.tar.zst nixlib-1401241864c48ebab0f3b8c2df446e0c3ba4a720.zip | |
qrencode-3.2.0
Remove builderDefs magic, add meta Cherry-pick r31382 from branches/libpng15 svn path=/nixpkgs/trunk/; revision=31385
| -rw-r--r-- | pkgs/tools/graphics/qrencode/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 12 insertions, 21 deletions
diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix index ae836ec086bb..866b121f76ba 100644 --- a/pkgs/tools/graphics/qrencode/default.nix +++ b/pkgs/tools/graphics/qrencode/default.nix @@ -1,27 +1,20 @@ -args : -let - lib = args.lib; - fetchurl = args.fetchurl; +{ stdenv, fetchurl, libpng, pkgconfig }: + +stdenv.mkDerivation rec { + name = "qrencode-3.2.0"; - version = lib.attrByPath ["version"] "3.0.3" args; - buildInputs = with args; [ - libpng pkgconfig - ]; -in -rec { src = fetchurl { - url = "http://megaui.net/fukuchi/works/qrencode/qrencode-${version}.tar.gz"; - sha256 = "1f5nnbk016casqfprdli50ssv08l0gj5zrd0q4rdvzfwqy67i7vm"; + url = "${meta.homepage}/${name}.tar.bz2"; + sha256 = "13q6cz2lif8d7y95f8sgfqaxc1qr0sz9nl2xh71lfmx7v5ybri03"; }; - inherit buildInputs; - configureFlags = []; + buildInputs = [ libpng ]; + buildNativeInputs = [ pkgconfig ]; - /* doConfigure should be specified separately */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - name = "qrencode-" + version; meta = { + homepage = http://fukuchi.org/works/qrencode/; description = "QR code encoder"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 036aef96040b..e2da9fe27dfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6859,9 +6859,7 @@ let opencv = opencv_2_1; }; - qrencode = builderDefsPackage (import ../tools/graphics/qrencode) { - inherit libpng pkgconfig; - }; + qrencode = callPackage ../tools/graphics/qrencode { }; gecko_mediaplayer = callPackage ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer { inherit (gnome) GConf; |