Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: afbf0c4fe7b0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fc3e172170da
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 12, 2018

  1. masterpdfeditor: 5.1.12 -> 5.1.36

    Alexandre Peyroux committed Sep 12, 2018
    Copy the full SHA
    899b766 View commit details

Commits on Oct 13, 2018

  1. masterpdfeditor: use qtbase.qtPluginPrefix #44047

    Alexandre Peyroux authored and Alexandre Peyroux committed Oct 13, 2018
    Copy the full SHA
    63b897a View commit details

  2. masterpdfeditor: 5.1.36 -> 5.1.60

    Alexandre Peyroux authored and Alexandre Peyroux committed Oct 13, 2018
    Copy the full SHA
    27298d3 View commit details

  3. Merge pull request #46579 from apeyroux/masterpdfeditor-5112-to-5136 

    masterpdfeditor: 5.1.12 -> 5.1.60
    @flokli
    flokli authored Oct 13, 2018
    Copy the full SHA
    fc3e172 View commit details
Showing with 9 additions and 4 deletions.
  1. +9 −4 pkgs/applications/misc/masterpdfeditor/default.nix
13 changes: 9 additions & 4 deletions pkgs/applications/misc/masterpdfeditor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook }:
{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }:

let
version = "5.1.12";
version = "5.1.60";

in stdenv.mkDerivation {
name = "masterpdfeditor-${version}";

src = fetchurl {
url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
sha256 = "1i3pdrhnlj06phm36gs42s6b94pigcfb8wa5dhmplxn0dqp434hq";
sha256 = "0br5f04klzpbd25igbjjj1dqasmrcrw2zsan5bv0ydnr2lmpb2fz";
};

nativeBuildInputs = [ autoPatchelfHook ];
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

buildInputs = [ nss qtbase qtsvg sane-backends stdenv.cc.cc ];

dontStrip = true;

# Please remove this when #44047 is fixed
postInstall = ''
wrapProgram $out/bin/masterpdfeditor5 --prefix QT_PLUGIN_PATH : ${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
'';

installPhase = ''
runHook preInstall