From 8e541c08d6468e37f8e950b04994cc1782d9f99a Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Mon, 31 Jul 2017 16:48:37 +1000 Subject: [PATCH 1/5] masterpdfeditor: init at 4.2.70 --- .../misc/masterpdfeditor/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/misc/masterpdfeditor/default.nix diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix new file mode 100644 index 00000000000..9eb2cea0895 --- /dev/null +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }: + let + version = "4.2.70"; + in + stdenv.mkDerivation { + name = "masterpdfeditor-${version}"; + src = fetchurl { + url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; + sha256 = "0vl5gc1fzsmzl56vd9g3av48557if8a04vhhl5yna8by26h6xz0c"; + }; + libPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc + glibc + sane-backends + qtbase + qtsvg + libXext + libX11 + libXdmcp + libXau + libxcb + ]; + dontStrip = true; + installPhase = '' + mkdir -pv $out/bin + cp -v masterpdfeditor4 $out/bin/masterpdfeditor4 + cp -v masterpdfeditor4.png $out/bin/masterpdfeditor4.png + cp -v -r stamps $out/bin/stamps + cp -v -r templates $out/bin/templates + cp -v -r lang $out/bin/lang + cp -v -r fonts $out/bin/fonts + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $libPath \ + $out/bin/masterpdfeditor4 + ''; + meta = with stdenv.lib; { + description = "PDF Editor"; + homepage = "https://code-industry.net/free-pdf-editor/"; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = maintainers.cmcdragonkai; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60fad0499da..f2237b69249 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13669,6 +13669,8 @@ with pkgs; adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { }; + masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { }; + aeolus = callPackage ../applications/audio/aeolus { }; aewan = callPackage ../applications/editors/aewan { }; From fbf11263df6713ad4ca8ed76c948bd6afb5ce9ad Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 Nov 2017 21:13:11 +0100 Subject: [PATCH 2/5] masterpdfeditor: 4.2.70 -> 4.3.61 also add flokli as maintainer --- pkgs/applications/misc/masterpdfeditor/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 9eb2cea0895..12541e35655 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }: let - version = "4.2.70"; + version = "4.3.61"; in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "0vl5gc1fzsmzl56vd9g3av48557if8a04vhhl5yna8by26h6xz0c"; + sha256 = "1g6mx8nch6ypf78h6xsb673wim19wn5ni5840armzg0pvi3sfknm"; }; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc @@ -34,10 +34,10 @@ $out/bin/masterpdfeditor4 ''; meta = with stdenv.lib; { - description = "PDF Editor"; + description = "Master PDF Editor"; homepage = "https://code-industry.net/free-pdf-editor/"; license = licenses.unfreeRedistributable; platforms = platforms.linux; - maintainers = maintainers.cmcdragonkai; + maintainers = with maintainers; [ cmcdragonkai flokli ]; }; } From 8162e580f5ec8897729e0e6a6199dd90b3c01895 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 Nov 2017 22:15:09 +0100 Subject: [PATCH 3/5] masterpdfeditor: add .desktop file and LICENSE --- pkgs/applications/misc/masterpdfeditor/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 12541e35655..2d2fd2c7bed 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -22,13 +22,23 @@ ]; dontStrip = true; installPhase = '' - mkdir -pv $out/bin + mkdir -p $out/bin $out/share/applications $out/share/pixmaps + + substituteInPlace masterpdfeditor4.desktop \ + --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ + --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ + --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" + cp -v masterpdfeditor4 $out/bin/masterpdfeditor4 - cp -v masterpdfeditor4.png $out/bin/masterpdfeditor4.png + cp -v masterpdfeditor4.png $out/share/pixmaps/ + cp -v masterpdfeditor4.desktop $out/share/applications + cp -v -r stamps $out/bin/stamps cp -v -r templates $out/bin/templates cp -v -r lang $out/bin/lang cp -v -r fonts $out/bin/fonts + install -D license.txt $out/share/$name/LICENSE + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath \ $out/bin/masterpdfeditor4 From e4913c2d303cb58cc8d31abf0854d3b332fa62de Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 Nov 2017 23:58:54 +0100 Subject: [PATCH 4/5] masterpdfeditor: fix platform (amd64 only) --- pkgs/applications/misc/masterpdfeditor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 2d2fd2c7bed..764d400820d 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -47,7 +47,7 @@ description = "Master PDF Editor"; homepage = "https://code-industry.net/free-pdf-editor/"; license = licenses.unfreeRedistributable; - platforms = platforms.linux; + platforms = with platforms; [ "x86_64-linux" ]; maintainers = with maintainers; [ cmcdragonkai flokli ]; }; } From faa9afbdfd492ed262e67383fa69d5cddeb0e415 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 2 Nov 2017 10:48:03 +0100 Subject: [PATCH 5/5] masterpdfeditor: move assets into $out/opt/masterpdfeditor, symlink from $out/bin --- .../applications/misc/masterpdfeditor/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 764d400820d..76d23f1a8f0 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -22,26 +22,25 @@ ]; dontStrip = true; installPhase = '' - mkdir -p $out/bin $out/share/applications $out/share/pixmaps + p=$out/opt/masterpdfeditor + mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps substituteInPlace masterpdfeditor4.desktop \ --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" - - cp -v masterpdfeditor4 $out/bin/masterpdfeditor4 cp -v masterpdfeditor4.png $out/share/pixmaps/ cp -v masterpdfeditor4.desktop $out/share/applications - cp -v -r stamps $out/bin/stamps - cp -v -r templates $out/bin/templates - cp -v -r lang $out/bin/lang - cp -v -r fonts $out/bin/fonts + cp -v masterpdfeditor4 $p/ + ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4 + cp -v -r stamps templates lang fonts $p + install -D license.txt $out/share/$name/LICENSE patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath \ - $out/bin/masterpdfeditor4 + $p/masterpdfeditor4 ''; meta = with stdenv.lib; { description = "Master PDF Editor";