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

Merge pull request #270123 from Stunkymonkey/winhelpcgi-remove-override-libpng

Browse Source 
winhelpcgi: remove override libpng
This commit is contained in:
Rick van Schijndel 2023-12-31 19:30:10 +01:00 committed by GitHub
commit 66bdfb6806
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/winhelpcgi/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, libwmf, libpng, pkg-config, lib }: stdenv.mkDerivation {
name = "winhelpcgi-1.0-rc3";
{ stdenv, fetchurl, libwmf, libpng12, pkg-config, lib }: stdenv.mkDerivation {
pname = "winhelpcgi";
version = "1.0-rc3";
src = fetchurl {
url = "http://www.herdsoft.com/ftp/winhelpcgi_1.0-1.tar.gz";
@ -9,15 +10,14 @@
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libwmf libpng ];
buildInputs = [ libwmf libpng12 ];
meta = {
description = "CGI module for Linux, Solaris, MacOS X and AIX to read Windows Help Files";
homepage = "http://www.herdsoft.com/linux/produkte/winhelpcgi.html";
license = lib.licenses.gpl2Only;
maintainers = [ lib.maintainers.shlevy ];
platforms = lib.platforms.linux;
broken = stdenv.isAarch64;
};
}

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

@ -4158,9 +4158,7 @@ with pkgs;
wiiload = callPackage ../development/tools/wiiload { };
winhelpcgi = callPackage ../development/tools/winhelpcgi {
libpng = libpng12;
};
winhelpcgi = callPackage ../development/tools/winhelpcgi { };
wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { };