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: 41d887af6f56
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 834e7c4f0b46
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 16, 2018

  1. libjpeg-turbo: 1.5.3 -> 2.0.1

    @romildo
    romildo committed Nov 16, 2018
    Copy the full SHA
    1488f51 View commit details

Commits on Nov 23, 2018

  1. libjpeg-turbo: don't change ABI, don't add *.a 

    (refers to the parent commit)
    @vcunat
    vcunat committed Nov 23, 2018
    Copy the full SHA
    dd69374 View commit details

Commits on Nov 28, 2018

  1. Merge #50249: libjpeg-turbo: 1.5.3 -> 2.0.1 

    (into staging)
    @vcunat
    vcunat committed Nov 28, 2018
    Copy the full SHA
    834e7c4 View commit details
Showing with 14 additions and 7 deletions.
  1. +14 −7 pkgs/development/libraries/libjpeg-turbo/default.nix
21 changes: 14 additions & 7 deletions pkgs/development/libraries/libjpeg-turbo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
{ stdenv, fetchurl, nasm
}:
{ stdenv, fetchurl, cmake, nasm }:

stdenv.mkDerivation rec {
name = "libjpeg-turbo-${version}";
version = "1.5.3";
version = "2.0.1";

src = fetchurl {
url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
sha256 = "08r5b5mywwrxv4axvq80dm31cklz81grczlzlxr2xqa6pgi90j5j";
}; # github releases still need autotools, surprisingly
sha256 = "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75";
};

patches =
stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
./mingw-boolean.patch;

outputs = [ "bin" "dev" "out" "man" "doc" ];

nativeBuildInputs = [ nasm ];
nativeBuildInputs = [ cmake nasm ];

enableParallelBuilding = true;
preConfigure = ''
cmakeFlagsArray+=(
"-DCMAKE_INSTALL_BINDIR=$bin/bin"
"-DENABLE_STATIC=0"
)
'';

doCheck = true; # not cross;
checkTarget = "test";
preCheck = ''
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}:$LD_LIBRARY_PATH"
'';

meta = with stdenv.lib; {
homepage = http://libjpeg-turbo.virtualgl.org/;