Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bfb61a770929
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 81f5c2698a87
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 17, 2018

  1. clementine: add gst_plugins to buildInputs so setup hooks work 

    when the build was refactored in ef5e212, this was lost.  a4ba8c6
got most of it back, but missed the addition of gst_plugins to
buildInputs.

fixes #39960

(cherry picked from commit 6fcee4e)
Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
    @jerith666 @Ma27
    jerith666 authored and Ma27 committed Oct 17, 2018
    Copy the full SHA
    41905d6 View commit details

Commits on Oct 18, 2018

  1. sbt: 1.2.4 -> 1.2.6 

    (cherry picked from commit b2dabdc)
    @NeQuissimus
    NeQuissimus committed Oct 18, 2018
    Copy the full SHA
    81f5c26 View commit details
Showing with 5 additions and 4 deletions.
  1. +3 −2 pkgs/applications/audio/clementine/default.nix
  2. +2 −2 pkgs/development/tools/build-managers/sbt/default.nix
5 changes: 3 additions & 2 deletions pkgs/applications/audio/clementine/default.nix
View file
Original file line number Diff line number Diff line change
@@ -69,7 +69,8 @@ let
name = "clementine-free-${version}";
inherit src patches nativeBuildInputs postPatch;

buildInputs = buildInputs ++ [ makeWrapper ];
# gst_plugins needed for setup-hooks
buildInputs = buildInputs ++ [ makeWrapper gst_plugins ];

cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];

@@ -101,7 +102,7 @@ let
./clementine-spotify-blob.patch
];

buildInputs = buildInputs ++ [ libspotify makeWrapper gst_plugins ];
buildInputs = buildInputs ++ [ libspotify makeWrapper ];
# Only build and install the Spotify blob
preBuild = ''
cd ext/clementine-spotifyblob
4 changes: 2 additions & 2 deletions pkgs/development/tools/build-managers/sbt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

stdenv.mkDerivation rec {
name = "sbt-${version}";
version = "1.2.4";
version = "1.2.6";

src = fetchurl {
urls = [
"https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
"https://cocl.us/sbt-${version}.tgz"
];
sha256 = "06zv1mm4rhl0h6qa7m4w5lbwjcyqp43r183q36q9zlyip965mnrn";
sha256 = "1nv8r3j2vhp38qbb123n86wfhb6mvwz7vgrrsjp344zg211psncn";
};

patchPhase = ''