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: 12ae04518b00
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cc2deaf210f8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 2, 2019

  1. qmmp: use qt5's mkDerivation

    @bjornfor
    gnidorah authored and bjornfor committed Sep 2, 2019
    Copy the full SHA
    70aa380 View commit details

  2. dfilemanager: use qt5's mkDerivation

    @bjornfor
    gnidorah authored and bjornfor committed Sep 2, 2019
    Copy the full SHA
    cc2deaf View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/applications/audio/qmmp/default.nix
  2. +3 −3 pkgs/applications/misc/dfilemanager/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/audio/qmmp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, xlibsWrapper
{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, xlibsWrapper
, qtbase, qttools, qtmultimedia, qtx11extras
# transports
, curl, libmms
@@ -28,7 +28,7 @@
# Qmmp installs working .desktop file(s) all by itself, so we don't need to
# handle that.

stdenv.mkDerivation rec {
mkDerivation rec {
name = "qmmp-1.3.3";

src = fetchurl {
6 changes: 3 additions & 3 deletions pkgs/applications/misc/dfilemanager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }:
{ stdenv, mkDerivation, fetchgit, cmake, file, qtbase, qttools, solid }:

let
version = "git-2016-01-10";
in
stdenv.mkDerivation {
mkDerivation {
pname = "dfilemanager";
inherit version;
src = fetchgit {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {

buildInputs = [ cmake qtbase qttools file solid ];

cmakeFlags = "-DQT5BUILD=true";
cmakeFlags = [ "-DQT5BUILD=true" ];

meta = {
homepage = http://dfilemanager.sourceforge.net/;