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

Commits on Oct 5, 2019

  1. sidequest: 0.3.1 -> 0.7.2

    @rvolosatovs
    rvolosatovs committed Oct 5, 2019
    Copy the full SHA
    f69450c View commit details

Commits on Oct 10, 2019

  1. Merge pull request #70446 from rvolosatovs/update/sidequest 

    sidequest: 0.3.1 -> 0.7.2
    @c0bw3b
    c0bw3b authored Oct 10, 2019
    Copy the full SHA
    a9e6236 View commit details
Showing with 11 additions and 11 deletions.
  1. +11 −11 pkgs/applications/misc/sidequest/default.nix
22 changes: 11 additions & 11 deletions pkgs/applications/misc/sidequest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
let
pname = "sidequest";
version = "0.3.1";
version = "0.7.2";

desktopItem = makeDesktopItem rec {
name = "SideQuest";
exec = "SideQuest";
@@ -15,17 +15,17 @@
inherit pname version;

src = fetchurl {
url = "https://github.com/the-expanse/SideQuest/releases/download/${version}/SideQuest-linux-x64.tar.gz";
sha256 = "1hj398zzp1x74zhp9rlhqzm9a0ck6zh9bj39g6fpvc38zab5dj1p";
url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
sha256 = "035grhzqm3qdfcq5vn4a85lgb188rg60wlgc02r44cnj4sbsyyzj";
};

buildInputs = [ makeWrapper ];

buildCommand = ''
mkdir -p "$out/lib/SideQuest" "$out/bin"
tar -xzf "$src" -C "$out/lib/SideQuest" --strip-components 1
tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1
ln -s "$out/lib/SideQuest/SideQuest" "$out/bin"
ln -s "$out/lib/SideQuest/sidequest" "$out/bin"
fixupPhase
@@ -35,7 +35,7 @@
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \
"$out/lib/SideQuest/SideQuest"
"$out/lib/SideQuest/sidequest"
'';
};
in buildFHSUserEnv {
@@ -49,11 +49,11 @@
homepage = "https://github.com/the-expanse/SideQuest";
downloadPage = "https://github.com/the-expanse/SideQuest/releases";
license = licenses.mit;
maintainers = [ maintainers.joepie91 ];
maintainers = with maintainers; [ joepie91 rvolosatovs ];
platforms = [ "x86_64-linux" ];
};
};

targetPkgs = pkgs: [
sidequest
# Needed in the environment on runtime, to make QuestSaberPatch work
@@ -62,8 +62,8 @@

extraInstallCommands = ''
mkdir -p "$out/share/applications"
ln -s "${desktopItem}/share/applications/*" "$out/share/applications"
ln -s ${desktopItem}/share/applications/* "$out/share/applications"
'';

runScript = "SideQuest";
runScript = "sidequest";
}