From 72d6aaede64eab585cfe9af7cd8f053b7f8e3456 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 20 Jan 2019 08:47:27 +0100 Subject: [PATCH 1/2] linux-steam-integration: Clean up the derivation a bit --- .../games/linux-steam-integration/default.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix index 3b0aca6df28..29029880253 100644 --- a/pkgs/games/linux-steam-integration/default.nix +++ b/pkgs/games/linux-steam-integration/default.nix @@ -1,17 +1,12 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, git, gtk, pkgs, gettext, - gcc_multi, libressl }: + gcc_multi, libressl, gnome3, steam }: let version = "0.7.2"; - steamBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ steam ])}/steam"; - zenityBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ gnome3.zenity ])}/zenity"; in stdenv.mkDerivation rec { name = "linux-steam-integration-${version}"; - nativeBuildInputs = [ meson ninja pkgconfig git gettext gcc_multi ]; - buildInputs = [ gtk libressl ]; - src = fetchFromGitHub { owner = "solus-project"; repo = "linux-steam-integration"; @@ -20,15 +15,18 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ meson ninja pkgconfig git gettext gcc_multi ]; + buildInputs = [ gtk libressl ]; + # Patch lib paths (AUDIT_PATH and REDIRECT_PATH) in shim.c # Patch path to lsi-steam in lsi-steam.desktop # Patch path to zenity in lsi.c postPatch = '' - sed -i -e "s|/usr/|$out/|g" src/shim/shim.c - sed -i -e "s|/usr/|$out/|g" data/lsi-steam.desktop - sed -i -e "s|zenity|${zenityBinPath}|g" src/lsi/lsi.c - sed -i -e "s|Name=Linux Steam Integration|Name=Linux Steam Integration Settings|" data/lsi-settings.desktop.in - + substituteInPlace src/shim/shim.c --replace "/usr/" $out + substituteInPlace data/lsi-steam.desktop --replace "/usr/" $out + substituteInPlace src/lsi/lsi.c --replace zenity ${gnome3.zenity}/bin/zenity + substituteInPlace data/lsi-settings.desktop.in \ + --replace "Name=Linux Steam Integration" "Name=Linux Steam Integration Settings" ''; configurePhase = '' @@ -36,7 +34,7 @@ in stdenv.mkDerivation rec { meson build \ -Dwith-shim=co-exist \ -Dwith-frontend=true \ - -Dwith-steam-binary=${steamBinPath} \ + -Dwith-steam-binary=${steam}/bin/steam \ -Dwith-new-libcxx-abi=true \ -Dwith-libressl-mode=native \ --prefix / \ From 409b540d6be990760b758c3727ed1ca6b7ac5031 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 20 Jan 2019 08:48:02 +0100 Subject: [PATCH 2/2] linux-steam-integration: 0.7.2 -> 0.7.3 Release notes: https://github.com/clearlinux/linux-steam-integration/releases/tag/v0.7.3 The same person (Ikey) who developed Linux Steam Integration have left the Solus project where it was developed and works on Clearlinux now instead, which seems to have picked up this project and made the first release for a really long time. --- pkgs/games/linux-steam-integration/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix index 29029880253..edc73eeac92 100644 --- a/pkgs/games/linux-steam-integration/default.nix +++ b/pkgs/games/linux-steam-integration/default.nix @@ -2,16 +2,16 @@ gcc_multi, libressl, gnome3, steam }: let - version = "0.7.2"; + version = "0.7.3"; in stdenv.mkDerivation rec { name = "linux-steam-integration-${version}"; src = fetchFromGitHub { - owner = "solus-project"; + owner = "clearlinux"; repo = "linux-steam-integration"; rev = "v${version}"; - sha256 = "0yn71fvjqi63dxk04jsndb26pgipl0nla10sy94bi7q95pk3sdf6"; + sha256 = "0brv3swx8h170ycxksb31sf5jvj85csfpx7gjlf6yrfz7jw2j6vp"; fetchSubmodules = true; }; @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { various workarounds to get games working, and fixes long standing bugs in both games and the client ''; - homepage = https://github.com/solus-project/linux-steam-integration; + homepage = https://github.com/clearlinux/linux-steam-integration; license = licenses.lgpl21; maintainers = [ maintainers.etu ]; platforms = [ "x86_64-linux" ];