From f03215596d1f264fb32637833b868b0209ae06e5 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 20 Dec 2020 22:36:06 +0700 Subject: knightos-kimg: 0.3.0 -> 0.4.0 --- pkgs/development/tools/knightos/kimg/default.nix | 14 ++++++-------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/knightos/kimg/default.nix b/pkgs/development/tools/knightos/kimg/default.nix index bd4320637dc2..3f3f698693df 100644 --- a/pkgs/development/tools/knightos/kimg/default.nix +++ b/pkgs/development/tools/knightos/kimg/default.nix @@ -1,27 +1,25 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, imagemagick }: +{ stdenv, fetchFromGitHub, cmake, asciidoc }: stdenv.mkDerivation rec { pname = "kimg"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "KnightOS"; repo = "kimg"; rev = version; - sha256 = "00gj420m0jvhgm8kkslw8r69nl7r73bxrh6gqs2mx16ymcpkanpk"; + sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3"; }; - nativeBuildInputs = [ cmake asciidoc pkg-config ]; - - buildInputs = [ imagemagick ]; + nativeBuildInputs = [ cmake asciidoc ]; hardeningDisable = [ "format" ]; meta = with stdenv.lib; { homepage = "https://knightos.org/"; - description = "Converts image formats supported by ImageMagick to the KnightOS image format"; + description = "Converts image formats supported by stb_image to the KnightOS image format"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cdf4ec16500..1af242fba019 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9737,7 +9737,6 @@ in knightos-kimg = callPackage ../development/tools/knightos/kimg { asciidoc = asciidoc-full; - imagemagick = imagemagick7Big; }; knightos-kpack = callPackage ../development/tools/knightos/kpack { }; -- cgit v1.2.3