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: c6bed9f7dd29
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 32907db36c52
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 9, 2020

  1. krop: Add wrapQtAppsHook. Closes #77339

    @moretea
    moretea committed Jan 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    infinisil Silvan Mosberger
    GPG key ID: E8F1E9EAD284E17D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7d14a45 View commit details

Commits on Jan 16, 2020

  1. Merge pull request #77356 from moretea/krop-wrapQtAppsHook 

    krop: Add wrapQtAppsHook.
    @ttuegel
    ttuegel authored Jan 16, 2020
    Copy the full SHA
    32907db View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/applications/graphics/krop/default.nix
7 changes: 6 additions & 1 deletion pkgs/applications/graphics/krop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript }:
{ stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript, qt5}:

python3Packages.buildPythonApplication rec {
pname = "krop";
@@ -19,6 +19,11 @@ python3Packages.buildPythonApplication rec {
ghostscript
];

nativeBuildInputs = [ qt5.wrapQtAppsHook ];
makeWrapperArgs = [
"\${qtWrapperArgs[@]}"
];

# Disable checks because of interference with older Qt versions // xcb
doCheck = false;