cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #107261 from siraben/kimg-update

Browse source 
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
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 {
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;
};
}

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

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