6f8845d · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

libjpeg: modernize

commit6f8845d30dc8a855e1061d37e0f9cac3258393ff authorSandro Jäckel <sandro.jaeckel@gmail.com> dateMon 26 Jul 2021, 01:36 (5 years ago) parent8c90a87

2 files changed+10−35

compare with master

unifiedsplit

pkgs/development/libraries/libjpeg/builder.sh−25 pkgs/development/libraries/libjpeg/default.nix+10−10

pkgs/development/libraries/libjpeg/builder.shdeleted−25

@@ -1,25 +0,0 @@

1−source $stdenv/setup

2−

3−preConfigure() {

4− # Workarounds for the ancient libtool shipped by libjpeg.

5− ln -s $libtool/bin/libtool .

6− cp $libtool/share/libtool/config.guess .

7− cp $libtool/share/libtool/config.sub .

8−}

9−

10−preInstall() {

11− mkdir $out

12− mkdir $out/bin

13− mkdir $out/lib

14− mkdir $out/include

15− mkdir $out/man

16− mkdir $out/man/man1

17−}

18−

19−patchPhase() {

20− for i in $patches; do

21− patch < $i

22− done

23−}

24−

25−genericBuild

pkgs/development/libraries/libjpeg/default.nix+10−10

@@ -1,23 +1,23 @@

11{ lib, stdenv, fetchurl, static ? false }:

3−with lib;

4−

5−stdenv.mkDerivation {

6− name = "libjpeg-9d";

3+stdenv.mkDerivation rec {

4+ pname = "libjpeg";

5+ version = "9d";

87 src = fetchurl {

9− url = "http://www.ijg.org/files/jpegsrc.v9d.tar.gz";

8+ url = "http://www.ijg.org/files/jpegsrc.v${version}.tar.gz";

109 sha256 = "1vkip9rz4hz8f31a2kl7wl7f772wg1z0fg1fbd1653wzwlxllhvc";

1110 };

1211

13− configureFlags = optional static "--enable-static --disable-shared";

12+ configureFlags = lib.optional static "--enable-static --disable-shared";

1413

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

1615

17− meta = {

18− homepage = "http://www.ijg.org/";

16+ meta = with lib; {

17+ homepage = "https://www.ijg.org/";

1918 description = "A library that implements the JPEG image file format";

20− license = lib.licenses.free;

21− platforms = lib.platforms.unix;

19+ maintainers = with maintainers; [ ];

20+ license = licenses.free;

21+ platforms = platforms.unix;

2222 };

2323}