public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #107261 from siraben/kimg-update 

knightos-kimg: 0.3.0 -> 0.4.0
This commit is contained in:
Sandro 2020-12-20 23:52:13 +01:00 committed by GitHub
parent 9cb4d2f490 f03215596d
commit 643d16b7cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/tools/knightos/kimg/default.nix
View File

@ -1,27 +1,25 @@
{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, imagemagick }: { stdenv, fetchFromGitHub, cmake, asciidoc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kimg"; pname = "kimg";
version = "0.3.0"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KnightOS"; owner = "KnightOS";
repo = "kimg"; repo = "kimg";
rev = version; rev = version;
sha256 = "00gj420m0jvhgm8kkslw8r69nl7r73bxrh6gqs2mx16ymcpkanpk"; sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3";
}; };
nativeBuildInputs = [ cmake asciidoc pkg-config ]; nativeBuildInputs = [ cmake asciidoc ];
buildInputs = [ imagemagick ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://knightos.org/"; 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; license = licenses.mit;
maintainers = with maintainers; [ siraben ]; maintainers = with maintainers; [ siraben ];
platforms = platforms.unix; platforms = platforms.all;
}; };
} }

1
pkgs/top-level/all-packages.nix
View File

@ -9739,7 +9739,6 @@ in
knightos-kimg = callPackage ../development/tools/knightos/kimg { knightos-kimg = callPackage ../development/tools/knightos/kimg {
asciidoc = asciidoc-full; asciidoc = asciidoc-full;
imagemagick = imagemagick7Big;
}; };
knightos-kpack = callPackage ../development/tools/knightos/kpack { }; knightos-kpack = callPackage ../development/tools/knightos/kpack { };