From 1638e2adee953690a2347a875b53e6657a371265 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 28 Oct 2023 21:40:25 -0300 Subject: [PATCH] jasper: migrate to by-name --- .../ja/jasper/package.nix} | 20 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 10 deletions(-) rename pkgs/{development/libraries/jasper/default.nix => by-name/ja/jasper/package.nix} (83%) diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/by-name/ja/jasper/package.nix similarity index 83% rename from pkgs/development/libraries/jasper/default.nix rename to pkgs/by-name/ja/jasper/package.nix index 2df3e554c9b6..e154c2ca720f 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -5,14 +5,14 @@ , pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jasper"; version = "2.0.32"; src = fetchFromGitHub { owner = "jasper-software"; - repo = pname; - rev = "version-${version}"; + repo = "jasper"; + rev = "version-${finalAttrs.version}"; hash = "sha256-Uwgtex0MWC/pOmEr8itHMIa4wxd97c/tsTzcLgV8D0I="; }; @@ -21,7 +21,11 @@ stdenv.mkDerivation rec { pkg-config ]; - meta = with lib; { + cmakeBuildDir = "build-directory"; + + strictDeps = true; + + meta = { homepage = "https://jasper-software.github.io/jasper/"; description = "Image processing/coding toolkit"; longDescription = '' @@ -41,8 +45,8 @@ stdenv.mkDerivation rec { was chosen primarily due to the availability of C development environments for most computing platforms when JasPer was first developed, circa 1999. ''; - license = licenses.free; # MIT-like - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fc82067c73d..ba91e206d4d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22258,8 +22258,6 @@ with pkgs; jarowinkler-cpp = callPackage ../development/libraries/jarowinkler-cpp { }; - jasper = callPackage ../development/libraries/jasper { }; - jbig2dec = callPackage ../development/libraries/jbig2dec { }; jbig2enc = callPackage ../development/libraries/jbig2enc { };