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

Commits on Oct 3, 2019

  1. soulseekqt: fix build 

    - Previous url returned a 404
- Updated expression to use new Qt utilities
- Cleaned up expression
    Jonathan Ringer committed Oct 3, 2019
    Copy the full SHA
    c83aaba View commit details

Commits on Nov 7, 2019

  1. Merge pull request #70298 from jonringer/fix-soulseekqt 

    soulseekqt: fix build
    @matthewbauer
    matthewbauer authored Nov 7, 2019
    Copy the full SHA
    a9e9379 View commit details
Showing with 23 additions and 35 deletions.
  1. +23 −35 pkgs/applications/networking/p2p/soulseekqt/default.nix
58 changes: 23 additions & 35 deletions pkgs/applications/networking/p2p/soulseekqt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,47 @@
{ stdenv
, fetchurl
{ stdenv, lib, fetchurl, mkDerivation
, autoPatchelfHook
, dbus
, zlib, fontconfig
, qtbase, qtmultimedia
, libjson, libgpgerror
, libX11, libxcb, libXau, libXdmcp, freetype, libbsd
, pythonPackages, squashfsTools, desktop-file-utils
, desktop-file-utils
, fontconfig
, libjson
, pythonPackages
, qtmultimedia
, squashfsTools
, zlib
}:

with stdenv.lib;
let
libPath = makeLibraryPath
[ stdenv.cc.cc qtbase qtmultimedia dbus libX11 zlib libX11 libxcb libXau libXdmcp freetype fontconfig libbsd libjson libgpgerror];

mkDerivation rec {
pname = "soulseekqt";
version = "2018-1-30";

mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit");
srcs = {
x86_64-linux = fetchurl {
url = "https://www.dropbox.com/s/0vi87eef3ooh7iy/${mainbin}.tgz";
src = fetchurl {
urls = [
"https://www.dropbox.com/s/0vi87eef3ooh7iy/SoulseekQt-${version}.tgz"
"https://www.slsknet.org/SoulseekQt/Linux/SoulseekQt-${version}-64bit-appimage.tgz"
];
sha256 = "0d1cayxr1a4j19bc5a3qp9pg22ggzmd55b6f5av3lc6lvwqqg4w6";
};
};

in stdenv.mkDerivation rec {

pname = "soulseekqt";
inherit version;
src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");

dontBuild = true;

buildInputs = [ pythonPackages.binwalk squashfsTools desktop-file-utils ];
nativeBuildInputs = [ autoPatchelfHook pythonPackages.binwalk squashfsTools desktop-file-utils ];
buildInputs = [ qtmultimedia stdenv.cc.cc ];

# avoid usage of appimage's runner option --appimage-extract
# avoid usage of appimage's runner option --appimage-extract
unpackCmd = ''
export HOME=$(pwd) # workaround for binwalk
appimage=$(tar xvf $curSrc) && binwalk --quiet \
$appimage -D 'squashfs:squashfs:unsquashfs %e'
'';

patchPhase = ''
cd squashfs-root/
binary="$(readlink AppRun)"
# fixup desktop file
desktop-file-edit --set-key Exec --set-value $binary default.desktop
desktop-file-edit --set-key Comment --set-value "${meta.description}" default.desktop
desktop-file-edit --set-key Categories --set-value Network default.desktop
desktop-file-edit --set-key Categories --set-value Network default.desktop
'';

installPhase = ''
@@ -57,13 +51,7 @@ in stdenv.mkDerivation rec {
cp $binary $out/bin/
'';

fixupPhase = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${libPath} \
$out/bin/$binary
'';

meta = with stdenv.lib; {
meta = with lib; {
description = "Official Qt SoulSeek client";
homepage = http://www.soulseekqt.net;
license = licenses.unfree;