pyrox.dev
adobe-reader: use meta.platforms, cleanup version, minor formatting
+6
-12
pkgs/applications/misc/adobe-reader/default.nix
+6
-12
pkgs/applications/misc/adobe-reader/default.nix
···
13
13
, gdk-pixbuf-xlib
14
14
}:
15
15
16
-
assert stdenv.hostPlatform.system == "i686-linux";
17
-
18
-
let
19
-
baseVersion = "9.5.5";
20
-
in
21
16
stdenv.mkDerivation rec {
22
17
pname = "adobe-reader";
23
-
version = "${baseVersion}-1";
18
+
version = "9.5.5";
24
19
20
+
# TODO: convert to phases
25
21
builder = ./builder.sh;
26
22
27
23
src = fetchurl {
28
-
url = "http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${baseVersion}/enu/AdbeRdr${version}_i486linux_enu.tar.bz2";
24
+
url = "http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${version}/enu/AdbeRdr${version}-1_i486linux_enu.tar.bz2";
29
25
sha256 = "0h35misxrqkl5zlmmvray1bqf4ywczkm89n9qw7d9arqbg3aj3pf";
30
26
};
31
27
32
28
# !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.
33
-
# We should probably remove those and use the regular Nixpkgs
34
-
# versions.
35
-
36
-
libPath = lib.makeLibraryPath
37
-
[ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ];
29
+
# We should probably remove those and use the regular Nixpkgs versions.
30
+
libPath = lib.makeLibraryPath [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ];
38
31
39
32
passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux";
40
33
···
46
39
"Numerous unresolved vulnerabilities"
47
40
"See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53"
48
41
];
42
+
platforms = [ "i686-linux" ];
49
43
};
50
44
}