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/radio | |
| 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/radio')
| -rw-r--r-- | pkgs/applications/radio/gnuradio/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/radio/gnuradio/shared.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/radio/unixcw/default.nix | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 9223f160db3..9bc1511968b 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -218,6 +218,7 @@ let passthru doCheck dontWrapPythonPrograms + dontWrapQtApps meta ; cmakeFlags = shared.cmakeFlags @@ -283,6 +284,7 @@ stdenv.mkDerivation rec { passthru doCheck dontWrapPythonPrograms + dontWrapQtApps meta ; } diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index 1d5d84f4649..9b354d5b960 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -109,6 +109,7 @@ rec { }; # Wrapping is done with an external wrapper dontWrapPythonPrograms = true; + dontWrapQtApps = true; # Tests should succeed, but it's hard to get LD_LIBRARY_PATH right in order # for it to happen. doCheck = false; diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index 5e299cc5984..cdb84670c61 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [libpulseaudio alsaLib pkg-config qt5.qtbase]; CFLAGS ="-lasound -lpulse-simple"; + dontWrapQtApps = true; + meta = with lib; { description = "sound characters as Morse code on the soundcard or console speaker"; longDescription = '' |