MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 00:08:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #70673 from Profpatsch/ultrastar-creator-manager-wrapQtAppHook

Browse source 
ultrastar-creator/ultrastar-manager: wrapQtAppsHook
This commit is contained in:
worldofpeace 2019-10-08 11:17:33 +00:00 committed by GitHub
commit f05062e6a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/misc/ultrastar-creator/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub
{ lib, mkDerivation, fetchFromGitHub
, qmake, qtbase, pkgconfig, taglib, libbass, libbass_fx }:
# TODO: get rid of (unfree) libbass
@ -6,7 +6,7 @@
# there’s a WIP branch here:
# https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed
stdenv.mkDerivation {
mkDerivation {
pname = "ultrastar-creator";
version = "2019-04-23";
@ -17,7 +17,7 @@ stdenv.mkDerivation {
sha256 = "1rzz04l7s7pxj74xam0cxlq569lfpgig35kpbsplq531d4007pc9";
};
postPatch = with stdenv.lib; ''
postPatch = with lib; ''
# we don’t want prebuild binaries checked into version control!
rm -rf lib include
sed -e "s|DESTDIR =.*$|DESTDIR = $out/bin|" \
@ -36,7 +36,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ qmake pkgconfig ];
buildInputs = [ qtbase taglib libbass libbass_fx ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Ultrastar karaoke song creation tool";
homepage = https://github.com/UltraStar-Deluxe/UltraStar-Creator;
license = licenses.gpl2;

12
pkgs/tools/misc/ultrastar-manager/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins
{ lib, mkDerivation, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins
, qtbase, qtmultimedia, taglib, libmediainfo, libzen, libbass }:
let
@ -24,12 +24,12 @@ let
repo = "UltraStar-Manager";
inherit rev sha256;
};
in stdenv.mkDerivation {
in mkDerivation {
name = "${src.name}-patched";
inherit src;
phases = [ "unpackPhase" "patchPhase" ];
patchPhase = with stdenv.lib; ''
patchPhase = with lib; ''
# we don’t want prebuild binaries checked into version control!
rm -rf lib include
@ -55,7 +55,7 @@ let
sed -e "s|QCore.*applicationDirPath()|QString(\"${path}\")|" -i "${file}"
'';
buildPlugin = name: stdenv.mkDerivation {
buildPlugin = name: mkDerivation {
name = "ultrastar-manager-${name}-plugin-${version}";
src = patchedSrc;
@ -82,7 +82,7 @@ let
paths = map buildPlugin plugins;
};
in stdenv.mkDerivation {
in mkDerivation {
pname = "ultrastar-manager";
inherit version;
src = patchedSrc;
@ -112,7 +112,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
inherit buildInputs;
meta = with stdenv.lib; {
meta = with lib; {
description = "Ultrastar karaoke song manager";
homepage = https://github.com/UltraStar-Deluxe/UltraStar-Manager;
license = licenses.gpl2;