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: 31f5dd3f3655
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9fca265abda3
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 19, 2021

  1. klog: pkgconfig -> pkg-config

    @zowoq
    zowoq committed Jan 19, 2021
    Copy the full SHA
    9fca265 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/radio/klog/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/radio/klog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, hamlib, pkgconfig, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }:
{ stdenv, fetchurl, hamlib, pkg-config, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }:

stdenv.mkDerivation rec {
pname = "klog";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1d5x7rq0mgfrqws3q1y4z8wh2qa3gvsmd0ssf2yqgkyq3fhdrb5c";
};

nativeBuildInputs = [ pkgconfig wrapQtAppsHook qmake qttools ];
nativeBuildInputs = [ pkg-config wrapQtAppsHook qmake qttools ];
buildInputs = [ hamlib qtbase qtserialport qtcharts ];

qmakeFlags = [ "KLog.pro" ];