Skip to content

Commit 97fd0de

Browse files
committed
jbigkit: switch to finalAttrs pattern
1 parent d70eb6a commit 97fd0de

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

pkgs/by-name/jb/jbigkit/package.nix

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
fetchpatch,
66
}:
77

8-
stdenv.mkDerivation rec {
8+
stdenv.mkDerivation (finalAttrs: {
99
pname = "jbigkit";
1010
version = "2.1";
1111

1212
src = fetchurl {
13-
url = "https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${pname}-${version}.tar.gz";
14-
sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy";
13+
url = "https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/jbigkit-${finalAttrs.version}.tar.gz";
14+
hash = "sha256-3nEGtr+vSV1oZcfdesbKE4G9EuDYFAXqgefyFnJj2TI=";
1515
};
1616

1717
patches = [
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
2828
];
2929

3030
makeFlags = [
31-
"CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
3231
"AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
32+
"CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
3333
"RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
3434
];
3535

@@ -61,10 +61,10 @@ stdenv.mkDerivation rec {
6161
runHook postInstall
6262
'';
6363

64-
meta = with lib; {
65-
homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/";
64+
meta = {
6665
description = "Software implementation of the JBIG1 data compression standard";
67-
license = licenses.gpl2Plus;
68-
platforms = platforms.all;
66+
homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/";
67+
license = lib.licenses.gpl2Plus;
68+
platforms = lib.platforms.all;
6969
};
70-
}
70+
})

0 commit comments

Comments
 (0)