Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aa54135d2cc9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6b311bef63dc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 22, 2019

  1. imgcat: 2.3.0 -> 2.3.1

    @marsam
    marsam committed Jun 22, 2019
    Copy the full SHA
    45efec3 View commit details

Commits on Jun 23, 2019

  1. Merge pull request #63642 from marsam/update-imgcat 

    imgcat: 2.3.0 -> 2.3.1
    @marsam
    marsam authored Jun 23, 2019
    Copy the full SHA
    6b311be View commit details
Showing with 8 additions and 9 deletions.
  1. +8 −9 pkgs/applications/graphics/imgcat/default.nix
17 changes: 8 additions & 9 deletions pkgs/applications/graphics/imgcat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, ncurses }:

stdenv.mkDerivation rec {
name = "imgcat-${version}";
version = "2.3.0";
pname = "imgcat";
version = "2.3.1";

buildInputs = [ autoconf automake libtool ncurses ];
nativeBuildInputs = [ autoconf automake libtool ];
buildInputs = [ ncurses ];

preConfigure = ''
${autoconf}/bin/autoconf
sed -i -e "s|-ltermcap|-L ${ncurses}/lib -lncurses|" Makefile
'';

preInstall = ''
makeFlagsArray=(PREFIX="$out");
'';
makeFlags = [ "PREFIX=$(out)" ];

src = fetchFromGitHub {
owner = "eddieantonio";
repo = "imgcat";
rev = "3d854c72f785dce0eecd9485767a7f972d54890c";
sha256 = "0m83c33rzxvs0w214njql2c7q3fg06wnyijch3l2s88i7frl121f";
repo = pname;
rev = "v${version}";
sha256 = "0frz40rjwi73nx2dlqvmnn56zwr29bmnngfb11hhwr7v58yfajdi";
};

NIX_CFLAGS_COMPILE = "-Wno-error";