diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix new file mode 100644 index 000000000000..0fe473f5d634 --- /dev/null +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, libdmtx, pkgconfig}: +let + s = # Generated upstream information + rec { + baseName="dmtx-utils"; + version="0.7.4"; + name="${baseName}-${version}"; + hash="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; + url="mirror://sourceforge/project/libdmtx/libdmtx/0.7.4/dmtx-utils-0.7.4.tar.gz"; + sha256="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; + }; + buildInputs = [ + libdmtx pkgconfig + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = "Data matrix command-line utilities"; + license = stdenv.lib.licenses.lgpl2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/dmtx-utils/default.upstream b/pkgs/tools/graphics/dmtx-utils/default.upstream new file mode 100644 index 000000000000..8768681642e5 --- /dev/null +++ b/pkgs/tools/graphics/dmtx-utils/default.upstream @@ -0,0 +1,4 @@ +url http://sourceforge.net/projects/libdmtx/files/libdmtx/ +SF_version_dir +version_link 'dmtx-utils-.*[.]tar[.][a-z0-9]+/download$' +SF_redirect diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix deleted file mode 100644 index 30b3baa4690b..000000000000 --- a/pkgs/tools/graphics/dmtx/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -args : -let - lib = args.lib; - fetchurl = args.fetchurl; - - version = lib.attrByPath ["version"] "0.7.4" args; - buildInputs = with args; [ - libpng libtiff libjpeg librsvg imagemagick pkgconfig - zlib libX11 bzip2 libtool freetype fontconfig - ghostscript jasper xz - ]; -in -rec { - src = fetchurl { - url = "mirror://sourceforge/libdmtx/libdmtx-${version}.tar.bz2"; - sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n"; - }; - - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - name = "dmtx-" + version; - meta = { - description = "DataMatrix (2D bar code) processing tools"; - maintainers = [args.lib.maintainers.raskin]; - platforms = args.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd9ec3ebbfb7..c4c4454b5116 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8952,11 +8952,9 @@ let enableXft = config.dmenu.enableXft or false; }; - dmtx = builderDefsPackage (import ../tools/graphics/dmtx) { - inherit libpng libtiff libjpeg imagemagick librsvg - pkgconfig bzip2 zlib libtool freetype fontconfig - ghostscript jasper xz; - inherit (xlibs) libX11; + dmtx = dmtx-utils; + + dmtx-utils = callPackage (import ../tools/graphics/dmtx-utils) { }; docker = callPackage ../applications/virtualization/docker { };