steam: move to system-wide steam installation
This commit is contained in:
		
							parent
							
								
									c081c63146
								
							
						
					
					
						commit
						736ce95ef2
					
				
					 6 changed files with 29 additions and 58 deletions
				
			
		
							
								
								
									
										28
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										28
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							| 
						 | 
					@ -101,18 +101,38 @@
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "dzgui": {
 | 
					    "dzgui": {
 | 
				
			||||||
 | 
					      "inputs": {
 | 
				
			||||||
 | 
					        "dzgui": "dzgui_2",
 | 
				
			||||||
 | 
					        "nixpkgs": [
 | 
				
			||||||
 | 
					          "nixpkgs"
 | 
				
			||||||
 | 
					        ]
 | 
				
			||||||
 | 
					      },
 | 
				
			||||||
 | 
					      "locked": {
 | 
				
			||||||
 | 
					        "lastModified": 1674412112,
 | 
				
			||||||
 | 
					        "narHash": "sha256-8Dk2kSONepRfL4hWsBVShsOIwXyS4yh/frjIDrJx4C4=",
 | 
				
			||||||
 | 
					        "owner": "lelgenio",
 | 
				
			||||||
 | 
					        "repo": "dzgui-nix",
 | 
				
			||||||
 | 
					        "rev": "041210735c3c06b428c78ea09ddf2cbb8b41f708",
 | 
				
			||||||
 | 
					        "type": "github"
 | 
				
			||||||
 | 
					      },
 | 
				
			||||||
 | 
					      "original": {
 | 
				
			||||||
 | 
					        "owner": "lelgenio",
 | 
				
			||||||
 | 
					        "repo": "dzgui-nix",
 | 
				
			||||||
 | 
					        "type": "github"
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    "dzgui_2": {
 | 
				
			||||||
      "flake": false,
 | 
					      "flake": false,
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1674502539,
 | 
					        "lastModified": 1674502482,
 | 
				
			||||||
        "narHash": "sha256-B7HwDq2o7GCsDcp3enbV3Xa3OQsd4gbUU9D7x7CRwX8=",
 | 
					        "narHash": "sha256-X3Sze8Quexy2vp3A78+1buvsAwAGQR71aLAXNCHdka0=",
 | 
				
			||||||
        "owner": "aclist",
 | 
					        "owner": "aclist",
 | 
				
			||||||
        "repo": "dztui",
 | 
					        "repo": "dztui",
 | 
				
			||||||
        "rev": "82c6dbdfef223653f81136276f51ffa5222e8403",
 | 
					        "rev": "e76070818c434f43ee4dd4305069c29235a390f4",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
        "owner": "aclist",
 | 
					        "owner": "aclist",
 | 
				
			||||||
        "ref": "dzgui",
 | 
					 | 
				
			||||||
        "repo": "dztui",
 | 
					        "repo": "dztui",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -49,8 +49,8 @@
 | 
				
			||||||
    devenv.url = "github:cachix/devenv/v0.5";
 | 
					    devenv.url = "github:cachix/devenv/v0.5";
 | 
				
			||||||
    devenv.inputs.nixpkgs.follows = "nixpkgs-unstable";
 | 
					    devenv.inputs.nixpkgs.follows = "nixpkgs-unstable";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    dzgui.url = "github:aclist/dztui/dzgui";
 | 
					    dzgui.url = "github:lelgenio/dzgui-nix";
 | 
				
			||||||
    dzgui.flake = false;
 | 
					    dzgui.inputs.nixpkgs.follows = "nixpkgs";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # my stuff
 | 
					    # my stuff
 | 
				
			||||||
    dhist = {
 | 
					    dhist = {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -41,6 +41,7 @@
 | 
				
			||||||
  new-packages = (final: prev: packages // {
 | 
					  new-packages = (final: prev: packages // {
 | 
				
			||||||
    dhist = inputs.dhist.packages.${system}.dhist;
 | 
					    dhist = inputs.dhist.packages.${system}.dhist;
 | 
				
			||||||
    demoji = inputs.demoji.packages.${system}.demoji;
 | 
					    demoji = inputs.demoji.packages.${system}.demoji;
 | 
				
			||||||
 | 
					    dzgui = inputs.dzgui.packages.${system}.dzgui;
 | 
				
			||||||
    devenv = inputs.devenv.packages.${system}.devenv;
 | 
					    devenv = inputs.devenv.packages.${system}.devenv;
 | 
				
			||||||
    mpvpaper = inputs.wegank.packages.${prev.system}.mpvpaper;
 | 
					    mpvpaper = inputs.wegank.packages.${prev.system}.mpvpaper;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,7 +2,6 @@
 | 
				
			||||||
# You can build them using 'nix build .#example' or (legacy) 'nix-build -A example'
 | 
					# You can build them using 'nix build .#example' or (legacy) 'nix-build -A example'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{ pkgs, inputs }: {
 | 
					{ pkgs, inputs }: {
 | 
				
			||||||
  dzgui = pkgs.callPackage ./dzgui.nix { };
 | 
					 | 
				
			||||||
  plymouth-theme-red = pkgs.callPackage ./plymouth-theme-red.nix { inherit inputs; };
 | 
					  plymouth-theme-red = pkgs.callPackage ./plymouth-theme-red.nix { inherit inputs; };
 | 
				
			||||||
  cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { };
 | 
					  cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { };
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,49 +0,0 @@
 | 
				
			||||||
{ pkgs, lib, stdenv, fetchFromGitHub, makeWrapper }:
 | 
					 | 
				
			||||||
stdenv.mkDerivation rec {
 | 
					 | 
				
			||||||
  pname = "dzgui";
 | 
					 | 
				
			||||||
  version = "0.1";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  src = fetchFromGitHub {
 | 
					 | 
				
			||||||
    owner = "aclist";
 | 
					 | 
				
			||||||
    repo = "dztui";
 | 
					 | 
				
			||||||
    rev = "10c29c0542a07fb81b5922f96b416e3a2e8079cc";
 | 
					 | 
				
			||||||
    sha256 = "sha256-VmW0ohXK+9CAr4yGaA/NSW7+E1vUvZthom8MculmOEs=";
 | 
					 | 
				
			||||||
  };
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  nativeBuildInputs = [ makeWrapper ];
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  runtimeDeps = with pkgs; [
 | 
					 | 
				
			||||||
    curl
 | 
					 | 
				
			||||||
    jq
 | 
					 | 
				
			||||||
    python3
 | 
					 | 
				
			||||||
    steam
 | 
					 | 
				
			||||||
    wmctrl
 | 
					 | 
				
			||||||
    gnome.zenity
 | 
					 | 
				
			||||||
  ];
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  patchPhase = ''
 | 
					 | 
				
			||||||
    sed -i \
 | 
					 | 
				
			||||||
      -e 's|/usr/bin/zenity|${pkgs.gnome.zenity}/bin/zenity|' \
 | 
					 | 
				
			||||||
      -e 's|2>/dev/null||' \
 | 
					 | 
				
			||||||
      dzgui.sh
 | 
					 | 
				
			||||||
  '';
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  installPhase = ''
 | 
					 | 
				
			||||||
    install -Dm777 -T dzgui.sh $out/bin/.dzgui-unwrapped_
 | 
					 | 
				
			||||||
    makeWrapper $out/bin/.dzgui-unwrapped_ $out/bin/dzgui \
 | 
					 | 
				
			||||||
      --prefix PATH ':' ${lib.makeBinPath runtimeDeps}
 | 
					 | 
				
			||||||
  '';
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  meta = with lib; {
 | 
					 | 
				
			||||||
    homepage = "https://github.com/pronovic/banner";
 | 
					 | 
				
			||||||
    description = "DayZ TUI/GUI server browser";
 | 
					 | 
				
			||||||
    license = licenses.gpl3;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    longDescription = ''
 | 
					 | 
				
			||||||
      DZGUI allows you to connect to both official and modded/community DayZ
 | 
					 | 
				
			||||||
      servers on Linux and provides a graphical interface for doing so.
 | 
					 | 
				
			||||||
    '';
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    platforms = platforms.all;
 | 
					 | 
				
			||||||
  };
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -75,10 +75,10 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ## games
 | 
					    ## games
 | 
				
			||||||
    # lutris-unwrapped
 | 
					    # lutris-unwrapped
 | 
				
			||||||
    steam # It's enabled in the system config
 | 
					    # steam # It's enabled in the system config
 | 
				
			||||||
    gamescope
 | 
					    gamescope
 | 
				
			||||||
    protontricks
 | 
					    protontricks
 | 
				
			||||||
    (dzgui.overrideAttrs (_: { src = inputs.dzgui; }))
 | 
					    dzgui
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ## chat
 | 
					    ## chat
 | 
				
			||||||
    thunderbird
 | 
					    thunderbird
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue