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: 0281aa6a1fc2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1e1491900d8c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 27, 2019

  1. squeezelite: Fix codec libraries loading by using a wrapper 

    Fix args declaration
    @azazel75
    azazel75 committed Dec 27, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: F9DBED4859B271C0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    562facf View commit details

Commits on Jan 31, 2020

  1. Merge pull request #76587 from azazel75/squeezelite-libs 

    squeezelite: Fix codec libraries loading by using a wrapper
    @ryantm
    ryantm authored Jan 31, 2020
    Copy the full SHA
    1e14919 View commit details
Showing with 9 additions and 3 deletions.
  1. +9 −3 pkgs/applications/audio/squeezelite/default.nix
12 changes: 9 additions & 3 deletions pkgs/applications/audio/squeezelite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{ stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, mpg123 }:
{ stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, makeWrapper, mpg123 }:

stdenv.mkDerivation {
let
runtimeDeps = [ faad2 flac libmad libvorbis mpg123 ];
rpath = stdenv.lib.makeLibraryPath runtimeDeps;
in stdenv.mkDerivation {
name = "squeezelite-git-2018-08-14";

src = fetchFromGitHub {
@@ -10,7 +13,8 @@ stdenv.mkDerivation {
sha256 = "0di3d5qy8fhawijq6bxy524fgffvzl08dprrws0fs2j1a70fs0fh";
};

buildInputs = [ alsaLib faad2 flac libmad libvorbis mpg123 ];
buildInputs = [ alsaLib ] ++ runtimeDeps;
nativeBuildInputs = [ makeWrapper ];

enableParallelBuilding = true;

@@ -20,6 +24,7 @@ stdenv.mkDerivation {
install -Dm755 -t $out/bin squeezelite
install -Dm644 -t $out/share/doc/squeezelite *.txt *.md
wrapProgram $out/bin/squeezelite --set LD_LIBRARY_PATH $RPATH
runHook postInstall
'';

@@ -29,4 +34,5 @@ stdenv.mkDerivation {
license = licenses.gpl3;
platforms = platforms.linux;
};
RPATH = rpath;
}