From 3fa211dfb8bb7778ffdbc3d9f3037a46000146ad Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Wed, 20 Feb 2019 21:09:14 +0000 Subject: [PATCH 1/2] lepton: init at 1.2.1 --- pkgs/tools/graphics/lepton/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/graphics/lepton/default.nix diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix new file mode 100644 index 000000000000..5af8ad90f003 --- /dev/null +++ b/pkgs/tools/graphics/lepton/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, git, glibc }: + +stdenv.mkDerivation rec { + version = "1.2.1"; + name = "lepton-${version}"; + + src = fetchFromGitHub { + repo = "lepton"; + owner = "dropbox"; + rev = "c378cbfa2daaa99e8828be7395013f94cedb1bcc"; + sha256 = "1f2vyp0crj4yw27bs53vykf2fqk4w57gv3lh9dp89dh3y7wwh1ba"; + }; + + nativeBuildInputs = [ cmake git ]; + buildInputs = [ glibc.static ]; + + meta = { + homepage = https://github.com/dropbox/lepton; + description = "A tool to losslessly compress JPEGs"; + license = stdenv.lib.licenses.asl20; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ artemist ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f1ab70d6178..d3468d31f073 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1487,6 +1487,8 @@ in languagetool = callPackage ../tools/text/languagetool { }; + lepton = callPackage ../tools/graphics/lepton { }; + lief = callPackage ../development/libraries/lief {}; libndtypes = callPackage ../development/libraries/libndtypes { }; From a55d96bf9ed1ac531ba701e6a690b34ca1ac1079 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 21 Feb 2019 00:59:46 +0100 Subject: [PATCH 2/2] lepton: only build on x86_64-linux for now Darwin and `aarch64-linux` builds currently fail[1][2]. Also cleaned up the `meta` section a bit. [1] https://github.com/NixOS/nixpkgs/pull/56108/checks?check_run_id=66442317 [2] https://github.com/NixOS/nixpkgs/pull/56108#issue-254801596 --- pkgs/tools/graphics/lepton/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix index 5af8ad90f003..fec092db0c52 100644 --- a/pkgs/tools/graphics/lepton/default.nix +++ b/pkgs/tools/graphics/lepton/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake git ]; buildInputs = [ glibc.static ]; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/dropbox/lepton; description = "A tool to losslessly compress JPEGs"; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ artemist ]; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ artemist ]; }; }