dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #68144 from fgaz/fgaz/remove-qt-stdenv

Browse Source 
Switch my qt packages to qt-specific mkDerivation
This commit is contained in:
worldofpeace 2019-09-06 05:19:39 -04:00 committed by GitHub
commit 3b39b03f05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/audio/sfxr-qt/default.nix
View File

@ -1,11 +1,14 @@
{ stdenv, fetchFromGitHub { lib
, mkDerivation
, fetchFromGitHub
, cmake , cmake
, qtbase, qtquickcontrols2 , qtbase
, qtquickcontrols2
, SDL , SDL
, python3 , python3
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "sfxr-qt"; pname = "sfxr-qt";
version = "1.2.0"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -20,12 +23,13 @@ stdenv.mkDerivation rec {
(python3.withPackages (pp: with pp; [ pyyaml jinja2 ])) (python3.withPackages (pp: with pp; [ pyyaml jinja2 ]))
]; ];
buildInputs = [ buildInputs = [
qtbase qtquickcontrols2 qtbase
qtquickcontrols2
SDL SDL
]; ];
configurePhase = "cmake . -DCMAKE_INSTALL_PREFIX=$out"; configurePhase = "cmake . -DCMAKE_INSTALL_PREFIX=$out";
meta = with stdenv.lib; { meta = with lib; {
homepage = https://github.com/agateau/sfxr-qt; homepage = https://github.com/agateau/sfxr-qt;
description = "A sound effect generator, QtQuick port of sfxr"; description = "A sound effect generator, QtQuick port of sfxr";
license = licenses.gpl2; license = licenses.gpl2;

7
pkgs/applications/graphics/drawpile/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv { lib
, mkDerivation
, fetchurl , fetchurl
, cmake , cmake
, extra-cmake-modules , extra-cmake-modules
@ -31,7 +32,7 @@
, enableKisTablet ? false # enable improved graphics tablet support , enableKisTablet ? false # enable improved graphics tablet support
}: }:
with stdenv.lib; with lib;
let let
commonDeps = [ commonDeps = [
@ -57,7 +58,7 @@ let
qtx11extras qtx11extras
]; ];
in stdenv.mkDerivation rec { in mkDerivation rec {
pname = "drawpile"; pname = "drawpile";
version = "2.1.11"; version = "2.1.11";