From c16df620344b04042a93bb257529651ed65abb91 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 5 Sep 2019 14:47:57 +0200 Subject: [PATCH 1/2] drawpile: Switch to qt-specific mkDerivation --- pkgs/applications/graphics/drawpile/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 5db104f031c..46bfe64dd03 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, mkDerivation , fetchurl , cmake , extra-cmake-modules @@ -31,7 +32,7 @@ , enableKisTablet ? false # enable improved graphics tablet support }: -with stdenv.lib; +with lib; let commonDeps = [ @@ -57,7 +58,7 @@ let qtx11extras ]; -in stdenv.mkDerivation rec { +in mkDerivation rec { pname = "drawpile"; version = "2.1.11"; From 4f49bcf90597c322b6d621b90bcd0b1e94ee8aa8 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 5 Sep 2019 17:22:42 +0200 Subject: [PATCH 2/2] sfxr-qt: switch to qt-specific mkDerivation --- pkgs/applications/audio/sfxr-qt/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix index 5708ef0ce0a..706d0faa3bc 100644 --- a/pkgs/applications/audio/sfxr-qt/default.nix +++ b/pkgs/applications/audio/sfxr-qt/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchFromGitHub +{ lib +, mkDerivation +, fetchFromGitHub , cmake -, qtbase, qtquickcontrols2 +, qtbase +, qtquickcontrols2 , SDL , python3 }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "sfxr-qt"; version = "1.2.0"; src = fetchFromGitHub { @@ -20,12 +23,13 @@ stdenv.mkDerivation rec { (python3.withPackages (pp: with pp; [ pyyaml jinja2 ])) ]; buildInputs = [ - qtbase qtquickcontrols2 + qtbase + qtquickcontrols2 SDL ]; configurePhase = "cmake . -DCMAKE_INSTALL_PREFIX=$out"; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/agateau/sfxr-qt; description = "A sound effect generator, QtQuick port of sfxr"; license = licenses.gpl2;