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: 89e02c7516ff
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 59634a6639ec
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 18, 2017

  1. qt: fix qmakeHook -> qmake in few packages. 

    This seem to have been broken in #26336.
    @gleber
    gleber committed Jun 18, 2017
    Copy the full SHA
    2fb67d9 View commit details

  2. Merge pull request #26700 from gleber/fix-qmakeHook 

    qt: fix qmakeHook -> qmake in few packages.
    @LnL7
    LnL7 authored Jun 18, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    59634a6 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/feedreaders/rssguard/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, qmakeHook, qtwebengine, qttools, wrapGAppsHook }:
{ stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }:

stdenv.mkDerivation rec {
name = "rssguard-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};

buildInputs = [ qtwebengine qttools ];
nativeBuildInputs = [ qmakeHook wrapGAppsHook ];
nativeBuildInputs = [ qmake wrapGAppsHook ];
qmakeFlags = [ "CONFIG+=release" ];

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/tools/misc/ultrastar-creator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
, qmakeHook, qtbase, makeQtWrapper
, qmake, qtbase, makeQtWrapper
, pkgconfig, taglib, libbass, libbass_fx }:

stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
cd src
'';

nativeBuildInputs = [ qmakeHook makeQtWrapper pkgconfig ];
nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
buildInputs = [ qtbase taglib libbass libbass_fx ];

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/tools/misc/ultrastar-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmakeHook, diffPlugins
{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins
, qtbase, qtmultimedia, makeQtWrapper
, taglib, libmediainfo, libzen, libbass }:

@@ -60,7 +60,7 @@ let
name = "ultrastar-manager-${name}-plugin-${version}";
src = patchedSrc;

buildInputs = [ qmakeHook ] ++ buildInputs;
buildInputs = [ qmake ] ++ buildInputs;

postPatch = ''
sed -e "s|DESTDIR = .*$|DESTDIR = $out|" \