diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2020-12-20 23:52:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-20 23:52:13 +0100 |
| commit | 643d16b7cf7eae58d76eca3c6bc9b084ad6ca193 (patch) | |
| tree | ea15d2506389339e97b6a30c9a7c57504e7bcddd /pkgs | |
| parent | 9cb4d2f4903c1403c098393bf49207ad43f58d58 (diff) | |
| parent | f03215596d1f264fb32637833b868b0209ae06e5 (diff) | |
Merge pull request #107261 from siraben/kimg-update
knightos-kimg: 0.3.0 -> 0.4.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/knightos/kimg/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 6 insertions, 9 deletions
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 92c9ff5286d3..c8963d2ba305 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9739,7 +9739,6 @@ in knightos-kimg = callPackage ../development/tools/knightos/kimg { asciidoc = asciidoc-full; - imagemagick = imagemagick7Big; }; knightos-kpack = callPackage ../development/tools/knightos/kpack { }; |