From 646da4a9152697bd66e937265ef2c2a5cd402771 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 26 Nov 2023 13:03:23 +0100 Subject: [PATCH 1/2] winhelpcgi: remove override libpng --- pkgs/development/tools/winhelpcgi/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/winhelpcgi/default.nix b/pkgs/development/tools/winhelpcgi/default.nix index cd7bfe344357..25384cbcc535 100644 --- a/pkgs/development/tools/winhelpcgi/default.nix +++ b/pkgs/development/tools/winhelpcgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libwmf, libpng, pkg-config, lib }: stdenv.mkDerivation { +{ stdenv, fetchurl, libwmf, libpng12, pkg-config, lib }: stdenv.mkDerivation { name = "winhelpcgi-1.0-rc3"; src = fetchurl { @@ -9,7 +9,7 @@ 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3e5a64dc013..d53a337b853b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4131,9 +4131,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 { }; From cbe6928cc50bdcd82637e12af6ae7d191e5e30d0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 30 Dec 2023 11:51:09 +0100 Subject: [PATCH 2/2] winhelpcgi: cleanup --- pkgs/development/tools/winhelpcgi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/winhelpcgi/default.nix b/pkgs/development/tools/winhelpcgi/default.nix index 25384cbcc535..608ab00f50b6 100644 --- a/pkgs/development/tools/winhelpcgi/default.nix +++ b/pkgs/development/tools/winhelpcgi/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, libwmf, libpng12, pkg-config, lib }: stdenv.mkDerivation { - name = "winhelpcgi-1.0-rc3"; + pname = "winhelpcgi"; + version = "1.0-rc3"; src = fetchurl { url = "http://www.herdsoft.com/ftp/winhelpcgi_1.0-1.tar.gz"; @@ -13,11 +14,10 @@ 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; }; }