From 19af5d54d1be81f06016656d0b06f98306c898f6 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Thu, 6 Jul 2023 10:55:57 +0200 Subject: [PATCH 1/3] psutils: fix build on Darwin --- pkgs/tools/typesetting/psutils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/tools/typesetting/psutils/default.nix index c7f68f2bd52b..6588b5c5b284 100644 --- a/pkgs/tools/typesetting/psutils/default.nix +++ b/pkgs/tools/typesetting/psutils/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { Makefile.unix > Makefile ''; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + preInstall = '' mkdir -p $out/bin $out/share/man/man1 ''; From ffd250befbab5abab5c0f04b3b31cfb38eb9b0af Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Thu, 6 Jul 2023 10:56:18 +0200 Subject: [PATCH 2/3] psutils: modernize package and change src url --- pkgs/tools/typesetting/psutils/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/tools/typesetting/psutils/default.nix index 6588b5c5b284..f0f44881a1ec 100644 --- a/pkgs/tools/typesetting/psutils/default.nix +++ b/pkgs/tools/typesetting/psutils/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "17"; src = fetchurl { - url = "ftp://ftp.knackered.org/pub/psutils/psutils-p${version}.tar.gz"; - sha256 = "1r4ab1fvgganm02kmm70b2r1azwzbav2am41gbigpa2bb1wynlrq"; + url = "http://knackered.knackered.org/angus/download/${pname}/${pname}-p${version}.tar.gz"; + hash = "sha256-OFPreVhLqPvieoFUJbZan38Vsljg1DoFqFa9t11YiuQ="; }; configurePhase = '' @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/man/man1 ''; - meta = with lib; { + meta = { description = "Collection of useful utilities for manipulating PS documents"; homepage = "http://knackered.knackered.org/angus/psutils/"; - license = licenses.bsd3; + license = lib.licenses.bsd3; }; } From 06309b998124440cca7bf7f8e02a36405a045e88 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 6 Jul 2023 14:38:36 +0300 Subject: [PATCH 3/3] psutils: set platforms --- pkgs/tools/typesetting/psutils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/tools/typesetting/psutils/default.nix index f0f44881a1ec..3ff93ad23011 100644 --- a/pkgs/tools/typesetting/psutils/default.nix +++ b/pkgs/tools/typesetting/psutils/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "Collection of useful utilities for manipulating PS documents"; homepage = "http://knackered.knackered.org/angus/psutils/"; license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; }