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

Commits on Oct 8, 2019

  1. ultrastar-creator: use qt5's mkDerivation

    @worldofpeace
    worldofpeace committed Oct 8, 2019
    Copy the full SHA
    de3f492 View commit details

  2. ultastar-manager: use qt5's mkDerivation

    @worldofpeace
    worldofpeace committed Oct 8, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ee8032c View commit details

  3. Merge pull request #70673 from Profpatsch/ultrastar-creator-manager-w… 

    …rapQtAppHook

ultrastar-creator/ultrastar-manager: wrapQtAppsHook
    @worldofpeace
    worldofpeace authored Oct 8, 2019
    Copy the full SHA
    f05062e View commit details
Showing with 10 additions and 10 deletions.
  1. +4 −4 pkgs/tools/misc/ultrastar-creator/default.nix
  2. +6 −6 pkgs/tools/misc/ultrastar-manager/default.nix
8 changes: 4 additions & 4 deletions pkgs/tools/misc/ultrastar-creator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub
{ lib, mkDerivation, fetchFromGitHub
, qmake, qtbase, pkgconfig, taglib, libbass, libbass_fx }:

# TODO: get rid of (unfree) libbass
# issue:https://github.com/UltraStar-Deluxe/UltraStar-Creator/issues/3
# 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 changes: 6 additions & 6 deletions pkgs/tools/misc/ultrastar-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;