Unverified Commit 78110f51 authored by Arnout Engelen's avatar Arnout Engelen Committed by GitHub
Browse files

inkcut: 2.1.5 -> 2.1.6 (#399216)

parents 9bebe64e b0eac382

pkgs/applications/misc/inkcut/default.nix→pkgs/by-name/in/inkcut/package.nix

+4 −26
Original line number Diff line number Diff line
@@ -3,49 +3,27 @@ 
  fetchpatch,

  python3,

  fetchFromGitHub,

  wrapQtAppsHook,

  qt5,

  cups,

}:



python3.pkgs.buildPythonApplication rec {

  pname = "inkcut";

  version = "2.1.5";

  version = "2.1.6";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    tag = "v${version}";

    sha256 = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU=";

    hash = "sha256-qfgzJTFr4VTV/x4PVnUKJzIndfjXB8z2jTWLXvadBuY=";

  };



  patches = [

    # fix opening the extension on inkscape 1.2

    # https://github.com/inkcut/inkcut/pull/340

    (fetchpatch {

      url = "https://github.com/inkcut/inkcut/commit/d5d5d0ab3c588c576b668f4c7b07a10609ba2fd0.patch";

      hash = "sha256-szfiOujuV7OOwYK/OU51m9FK6dzkbWds+h0cr5dGIg4=";

    })

    # fix loading a document from stdin (as used from the extension)

    # https://github.com/inkcut/inkcut/issues/341

    (fetchpatch {

      url = "https://github.com/inkcut/inkcut/commit/748ab4157f87afec37dadd715094e87d02c9c739.patch";

      hash = "sha256-ZGiwZru2bUYu749YSz5vxmGwLTAoYIAsafcX6PmdbYo=";

      revert = true;

    })

    # fix distutils deprecation error

    # https://github.com/inkcut/inkcut/pull/343

    (fetchpatch {

      url = "https://github.com/inkcut/inkcut/commit/9fb95204981bcc51401a1bc10caa02d1fae0d6cb.patch";

      hash = "sha256-nriys7IWPGykZjVz+DIDsE9Tm40DewkHQlIUaxFwtzM=";

    })

  ];



  postPatch = ''

    substituteInPlace inkcut/device/transports/printer/plugin.py \

      --replace ", 'lpr', " ", '${cups}/bin/lpr', "

  '';



  nativeBuildInputs = [ wrapQtAppsHook ];

  nativeBuildInputs = [ qt5.wrapQtAppsHook ];



  propagatedBuildInputs = with python3.pkgs; [

    enamlx

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -12988,8 +12988,6 @@ with pkgs; 














  imgp = python3Packages.callPackage ../applications/graphics/imgp { };



























  inkcut = libsForQt5.callPackage ../applications/misc/inkcut { };



























  inkscape = callPackage ../applications/graphics/inkscape {















    lcms = lcms2;















  };