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

Commits on Aug 4, 2019

  1. mixxx: use qt5.mkDerivation

    @suhr
    suhr committed Aug 4, 2019

    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
    eb1ada7 View commit details

  2. Merge pull request #65980 from suhr/mixxx 

    mixxx: use qt5.mkDerivation
    @Ma27
    Ma27 authored Aug 4, 2019
    Copy the full SHA
    e66f752 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/audio/mixxx/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/audio/mixxx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, makeWrapper, chromaprint
{ stdenv, mkDerivation, fetchFromGitHub, makeWrapper, chromaprint
, fftw, flac, faad2, glibcLocales, mp4v2
, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
, libGLU, libxcb, lilv, lv2, opusfile
, pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg
, qtx11extras, rubberband, scons, sqlite, taglib, upower, vampSDK
}:

stdenv.mkDerivation rec {
mkDerivation rec {
name = "mixxx-${version}";
version = "2.2.1";