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

Commits on Oct 9, 2020

  1. Copy the full SHA
    dd59167 View commit details
  2. Copy the full SHA
    95d4e9a View commit details
Showing with 21 additions and 21 deletions.
  1. +9 −9 pkgs/applications/audio/soundkonverter/default.nix
  2. +12 −12 pkgs/development/libraries/pangolin/default.nix
18 changes: 9 additions & 9 deletions pkgs/applications/audio/soundkonverter/default.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper,
cmake, extra-cmake-modules, pkgconfig,
libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui,
qtbase, phonon,
qtbase, phonon,
taglib,
# optional backends
withCD ? true, cdparanoia,
@@ -43,7 +43,7 @@ let runtimeDeps = []
++ lib.optionals withMp3 [ lame mp3gain ]
++ lib.optionals withAac [ faad2 aacgain ];

in
in
mkDerivation rec {
name = "soundkonverter";
version = "3.0.1";
@@ -67,7 +67,7 @@ mkDerivation rec {
propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon];
buildInputs = [ taglib ] ++ runtimeDeps;
# encoder plugins go to ${out}/lib so they're found by kbuildsycoca5
cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ];
cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ];
sourceRoot = "source/src";
# add runt-time deps to PATH
postInstall = ''
@@ -79,26 +79,26 @@ mkDerivation rec {
description = "Audio file converter, CD ripper and Replay Gain tool";
longDescription = ''
soundKonverter is a frontend to various audio converters.
The key features are:
- Audio file conversion
- Replay Gain calculation
- CD ripping
soundKonverter supports reading and writing tags and covers for many formats, so they are preserved when converting files.
It is extendable by plugins and supports many backends including:
- Audio file conversion
Backends: faac, faad, ffmpeg, flac, lame, mplayer, neroaac, timidity, fluidsynth, vorbistools, opustools, sox, twolame,
flake, mac, shorten, wavpack and speex
Formats: ogg vorbis, mp3, flac, wma, aac, ac3, opus, alac, mp2, als, amr nb, amr wb, ape, speex, m4a, mp1, musepack shorten,
tta, wavpack, ra, midi, mod, 3gp, rm, avi, mkv, ogv, mpeg, mov, mp4, flv, wmv and rv
- Replay Gain calculation
Backends: aacgain, metaflac, mp3gain, vorbisgain, wvgain, mpcgain
Formats: aac, mp3, flac, ogg vorbis, wavpack, musepack
- CD ripping
Backends: cdparanoia
'';
24 changes: 12 additions & 12 deletions pkgs/development/libraries/pangolin/default.nix
Original file line number Diff line number Diff line change
@@ -15,18 +15,18 @@ stdenv.mkDerivation {
sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0";
};

nativeBuildInputs = [ cmake pkgconfig doxygen ];

buildInputs = [
libGL
glew
xorg.libX11
ffmpeg_3
python3
libjpeg
libpng
libtiff
eigen
nativeBuildInputs = [ cmake pkgconfig doxygen ];

buildInputs = [
libGL
glew
xorg.libX11
ffmpeg_3
python3
libjpeg
libpng
libtiff
eigen
]
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ];