diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2021-01-26 16:24:41 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 16:24:41 -0600 |
| commit | 0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6 (patch) | |
| tree | f99b33906ce1ef4ec91eeff358e65954bde1d21a /pkgs/applications/misc/gpsbabel | |
| parent | a3b529a4606779b8351cde31f9877496cc188f18 (diff) | |
| parent | 13e3ec0d58a510742bb12f26d7c451ca4c94ce25 (diff) | |
| download | nixpkgs-0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6.tar nixpkgs-0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6.tar.gz nixpkgs-0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6.tar.bz2 nixpkgs-0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6.tar.lz nixpkgs-0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6.tar.xz nixpkgs-0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6.tar.zst nixpkgs-0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6.zip | |
Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDerivation
Qt: Do not require mkDerivation
Diffstat (limited to 'pkgs/applications/misc/gpsbabel')
| -rw-r--r-- | pkgs/applications/misc/gpsbabel/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/gpsbabel/gui.nix | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index f043aa66947..85c7fbae789 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + doCheck = true; preCheck = '' patchShebangs testo diff --git a/pkgs/applications/misc/gpsbabel/gui.nix b/pkgs/applications/misc/gpsbabel/gui.nix index 4025b313128..8501b7c0875 100644 --- a/pkgs/applications/misc/gpsbabel/gui.nix +++ b/pkgs/applications/misc/gpsbabel/gui.nix @@ -10,6 +10,8 @@ mkDerivation { nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtwebkit ]; + dontWrapQtApps = true; + postPatch = '' substituteInPlace mainwindow.cc \ --replace "QApplication::applicationDirPath() + \"/" "\"" \ |