From 5191691c46926adf629ead38747e89f5e4142d6b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 22 May 2020 09:00:39 +0200 Subject: [PATCH] linux-steam-integration: Drop abandoned package that doesn't build This fixes #88460 --- .../games/linux-steam-integration/default.nix | 81 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 3 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 pkgs/games/linux-steam-integration/default.nix diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix deleted file mode 100644 index 2a814f30a5f..00000000000 --- a/pkgs/games/linux-steam-integration/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, git, gtk, gettext, - gcc_multi, libressl, gnome3, steam }: - -let - version = "0.7.3"; - -in stdenv.mkDerivation { - pname = "linux-steam-integration"; - inherit version; - - src = fetchFromGitHub { - owner = "clearlinux"; - repo = "linux-steam-integration"; - rev = "v${version}"; - sha256 = "0brv3swx8h170ycxksb31sf5jvj85csfpx7gjlf6yrfz7jw2j6vp"; - 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 = '' - 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 = '' - # Configure 64bit things - meson build \ - -Dwith-shim=co-exist \ - -Dwith-frontend=true \ - -Dwith-steam-binary=${steam}/bin/steam \ - -Dwith-new-libcxx-abi=true \ - -Dwith-libressl-mode=native \ - --prefix / \ - --libexecdir lib \ - --libdir lib \ - --bindir bin - - # Configure 32bit things - CC="gcc -m32" CXX="g++ -m32" meson build32 \ - -Dwith-shim=none \ - -Dwith-libressl-mode=native \ - --prefix / \ - --libexecdir lib32 \ - --libdir lib32 - ''; - - buildPhase = '' - # Build 64bit things - ninja -C build - - # Build 32bit things - ninja -C build32 - ''; - - installPhase = '' - DESTDIR="$out" ninja -C build install - DESTDIR="$out" ninja -C build32 install - ''; - - meta = with stdenv.lib; { - description = "Steam wrapper to improve compability and performance"; - longDescription = '' - Linux Steam Integration is a helper system to make the Steam Client and - Steam games run better on Linux. In a nutshell, LSI automatically applies - various workarounds to get games working, and fixes long standing bugs in - both games and the client - ''; - homepage = "https://github.com/clearlinux/linux-steam-integration"; - license = licenses.lgpl21; - maintainers = [ maintainers.etu ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1ef754ccba0..5eb7c201183 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -266,6 +266,7 @@ mapAliases ({ linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; linux_testing_hardened = throw "linux_testing_hardened has been removed, please use linux_latest_hardened"; + linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22 loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ff52634963..d6be9351b6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23969,10 +23969,6 @@ in steamcmd = steamPackages.steamcmd; - linux-steam-integration = callPackage ../games/linux-steam-integration { - gtk = pkgs.gtk3; - }; - protontricks = callPackage ../tools/package-management/protontricks { inherit (python3Packages) buildPythonApplication pytest setuptools_scm vdf; inherit (gnome3) zenity;