From 68752602d9218ca34aaf0b2557a45f4981e14c36 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 12 Dec 2024 13:33:34 +0100 Subject: [PATCH 1/3] adobe-reader: merge custom build script --- .../applications/misc/adobe-reader/builder.sh | 43 ------------------ .../misc/adobe-reader/default.nix | 45 +++++++++++++++++-- 2 files changed, 42 insertions(+), 46 deletions(-) delete mode 100644 pkgs/applications/misc/adobe-reader/builder.sh diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh deleted file mode 100644 index 4291da80576d..000000000000 --- a/pkgs/applications/misc/adobe-reader/builder.sh +++ /dev/null @@ -1,43 +0,0 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - -echo "unpacking $src..." -tar xvfa $src - -echo "unpacking reader..." -p=$out/libexec/adobe-reader -mkdir -p $out/libexec -tar xvf AdobeReader/COMMON.TAR -C $out -tar xvf AdobeReader/ILINXR.TAR -C $out -mv $out/Adobe/Reader9 $p -rmdir $out/Adobe - -# Disable this plugin for now (it needs LDAP, and I'm too lazy to add it). -rm $p/Reader/intellinux/plug_ins/PPKLite.api - -# More pointless files. -rm $p/bin/UNINSTALL - -patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath \ - $p/Reader/intellinux/bin/acroread - -# The "xargs -r" is to shut up a warning when Mozilla can't be found. -substituteInPlace $p/bin/acroread \ - --replace /bin/pwd $(type -P pwd) \ - --replace /bin/ls $(type -P ls) \ - --replace xargs "xargs -r" - -mkdir -p $out/bin -ln -s $p/bin/acroread $out/bin/acroread - -mkdir -p $out/share/applications -mv $p/Resource/Support/AdobeReader.desktop $out/share/applications/ -icon=$p/Resource/Icons/128x128/AdobeReader9.png -[ -e $icon ] -sed -i $out/share/applications/AdobeReader.desktop \ - -e "s|Icon=.*|Icon=$icon|" - -# Not sure if this works. -mkdir -p $out/share/mimelnk/application -mv $p/Resource/Support/vnd*.desktop $out/share/mimelnk/application diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 3510d9393e43..a05c40ae89a0 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -18,9 +18,6 @@ stdenv.mkDerivation rec { pname = "adobe-reader"; version = "9.5.5"; - # TODO: convert to phases - builder = ./builder.sh; - src = fetchurl { url = "http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${version}/enu/AdbeRdr${version}-1_i486linux_enu.tar.bz2"; sha256 = "0h35misxrqkl5zlmmvray1bqf4ywczkm89n9qw7d9arqbg3aj3pf"; @@ -42,6 +39,48 @@ stdenv.mkDerivation rec { gdk-pixbuf-xlib ]; + installPhase = '' + p=$out/libexec/adobe-reader + mkdir -p $out/libexec + tar xvf COMMON.TAR -C $out + tar xvf ILINXR.TAR -C $out + mv $out/Adobe/Reader9 $p + rmdir $out/Adobe + + # Disable this plugin for now (it needs LDAP). + rm $p/Reader/intellinux/plug_ins/PPKLite.api + + # Remove unneeded files + rm $p/bin/UNINSTALL + ''; + + postFixup = '' + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $libPath \ + $p/Reader/intellinux/bin/acroread + + # The "xargs -r" is to shut up a warning when Mozilla can't be found. + substituteInPlace $p/bin/acroread \ + --replace-fail /bin/pwd $(type -P pwd) \ + --replace-fail /bin/ls $(type -P ls) \ + --replace-fail xargs "xargs -r" + + mkdir -p $out/bin + ln -s $p/bin/acroread $out/bin/acroread + + mkdir -p $out/share/applications + mv $p/Resource/Support/AdobeReader.desktop $out/share/applications/ + icon=$p/Resource/Icons/128x128/AdobeReader9.png + [ -e $icon ] + sed -i $out/share/applications/AdobeReader.desktop \ + -e "s|Icon=.*|Icon=$icon|" + + mkdir -p $out/share/mimelnk/application + mv $p/Resource/Support/vnd*.desktop $out/share/mimelnk/application + ''; + + dontStrip = true; + passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; meta = { From 517d1d2e718209c13471d42c7e6d64129cfd38d7 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 12 Dec 2024 13:34:08 +0100 Subject: [PATCH 2/3] adobe-reader: add onny as maintainer --- pkgs/applications/misc/adobe-reader/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index a05c40ae89a0..5a2ef03ac313 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { "See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53" ]; platforms = [ "i686-linux" ]; + maintainers = with lib.maintainers; [ onny ]; }; } From 4e81db679e8776af71f664fac129b10ae703ceb6 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 12 Dec 2024 13:34:26 +0100 Subject: [PATCH 3/3] adobe-reader: add mainProgram --- pkgs/applications/misc/adobe-reader/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 5a2ef03ac313..b98b427740a6 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -94,5 +94,6 @@ stdenv.mkDerivation rec { ]; platforms = [ "i686-linux" ]; maintainers = with lib.maintainers; [ onny ]; + mainProgram = "acroread"; }; }