From 75176e353c7e9d809f8465d70c76dc96452cec70 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 28 May 2021 20:51:08 +0900 Subject: [PATCH 1/2] feedgnuplot: fix perl shebang --- pkgs/tools/graphics/feedgnuplot/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 02bb022dfb47..768d65af0510 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -1,5 +1,6 @@ { lib, fetchFromGitHub, makeWrapper, gawk , makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages +, stdenv, shortenPerlShebang }: let @@ -21,7 +22,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; - nativeBuildInputs = [ makeWrapper gawk ]; + nativeBuildInputs = [ makeWrapper gawk ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; buildInputs = [ gnuplot perl ] ++ (with perlPackages; [ ListMoreUtils IPCRun StringShellQuote ]); @@ -36,7 +37,9 @@ perlPackages.buildPerlPackage rec { # Tests require gnuplot 4.6.4 and are completely skipped with gnuplot 5. doCheck = false; - postInstall = '' + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/feedgnuplot + '' + '' wrapProgram $out/bin/feedgnuplot \ --prefix "PATH" ":" "$PATH" \ --prefix "PERL5LIB" ":" "$PERL5LIB" From b9bf2ab441561e68c7e0467ba267e76bec63fcfd Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 28 May 2021 20:51:52 +0900 Subject: [PATCH 2/2] feedgnuplot: 1.51 -> 1.58 --- pkgs/tools/graphics/feedgnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 768d65af0510..51d3e1e868da 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -11,13 +11,13 @@ in perlPackages.buildPerlPackage rec { pname = "feedgnuplot"; - version = "1.51"; + version = "1.58"; src = fetchFromGitHub { owner = "dkogan"; repo = "feedgnuplot"; rev = "v${version}"; - sha256 = "0npk2l032cnmibjj5zf3ii09mpxciqn32lx6g5bal91bkxwn7r5i"; + sha256 = "1qix4lwwyhqibz0a6q2rrb497rmk00v1fvmdyinj0dqmgjw155zr"; }; outputs = [ "out" ];