fix libgbm import

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>

flake.nix

@@ -145,7 +145,7 @@
         }
       );
       inherit (lib.rad-dev.systems) genSystems getImages;
-      inherit (self) outputs; # for hydra
+      inherit (self) outputs; # for hydra and packages
     in
     rec {
       inherit lib; # for allowing use of custom functions in nix repl
@@ -160,10 +160,7 @@
         qcow = getImages nixosConfigurations "qcow";
       };
 
-      packages.x86_64-linux.lego-latest =
+      packages = import ./pkgs { pkgs = nixpkgs.legacyPackages.x86_64-linux; };
-        nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/lego-latest/default.nix
-          { };
-
       checks = import ./checks.nix { inherit inputs forEachSystem formatter; };
       devShells = import ./shell.nix { inherit inputs forEachSystem checks; };
 

lib/systems.nix

@@ -128,6 +128,7 @@ rec {
   # configPath: path to the folder containing hardware.nix & configuration.nix
   # hostname: hostname of the server
   # inputs: flake inputs to be used
+  # outputs: flake outputs to be used, primarily for accessing custom packages
   # src: base path of the repo
   # users: list of users to be added
   # home: enables home-manager on this machine (requires all users to have home-manager)
@@ -149,7 +150,7 @@ rec {
       configPath,
       hostname,
       inputs,
-      outputs,
+      outputs ? { },
       src,
       users,
       home ? true,
@@ -191,6 +192,7 @@ rec {
   #
   # args:
   # inputs: flake-inputs to be distributed to each system config
+  # outputs: flake-outputs to be distributed to each system config
   # src: the base path to the repo
   # path: the path to read the systems from, should be a directory containing one directory per machine, each having at least the following
   #   - default.nix (with the extra params for constructSystem in it, see systems/palatine-hill/default.nix for an example)
@@ -219,7 +221,7 @@ rec {
                 ;
               hostname = name;
             }
-            // import configPath { inherit inputs; }
+            // import configPath { inherit inputs outputs; }
           );
         }
       ) (lib.rad-dev.lsdir path)

modules/nix.nix

@@ -1,4 +1,9 @@
-{ lib, pkgs, ... }:
+{
+  lib,
+  pkgs,
+  outputs,
+  ...
+}:
 {
   nix = {
     package = pkgs.nixVersions.latest;
@@ -46,4 +51,11 @@
       dates = [ "01:00" ];
     };
   };
+
+  nixpkgs.overlays = [
+    (_: _: {
+      # bring all packages into a namespace called rad-pkgs
+      rad-pkgs = lib.genAttrs (lib.attrNames outputs.packages) (pkg: outputs.packages.${pkg});
+    })
+  ];
 }

pkgs/default.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+let
+  rad-maintainers = import ./maintainers.nix;
+in
+{
+
+  ftb-app = pkgs.callPackage ./ftb-app { inherit rad-maintainers; };
+  lego-latest = pkgs.callPackage ./lego-latest { inherit rad-maintainers; };
+}

pkgs/ftb-app/default.nix

@@ -0,0 +1,112 @@
+{
+  alsa-lib,
+  at-spi2-atk,
+  cairo,
+  cups,
+  dbus,
+  dpkg,
+  expat,
+  fetchurl,
+  gtk3,
+  gdk-pixbuf,
+  jre,
+  lib,
+  libdrm,
+  libgbm,
+  libxkbcommon,
+  makeWrapper,
+  mesa,
+  nspr,
+  nss,
+  pango,
+  rad-maintainers,
+  stdenv,
+  xorg,
+  ...
+}:
+# source_aarch64=("https://piston.feed-the-beast.com/app/ftb-app-${pkgver}-arm64.deb")
+# sha256sums_aarch64=(ad1197556a187693cbc488142562a0c17144e33056f1c914950c2f1496a4c532)
+stdenv.mkDerivation rec {
+  pname = "ftb-app";
+  version = "1.27.3";
+
+  src = fetchurl {
+    url = "https://piston.feed-the-beast.com/app/ftb-app-linux-${version}-amd64.deb";
+    sha256 = "031a73g58vj35h33pmp3swjrjlg09ismdx46810sp7ihrpvs0ad6";
+  };
+
+  nativeBuildInputs = [
+    dpkg
+    makeWrapper
+  ];
+
+  unpackPhase = ''
+    runHook preUnpack
+
+    dpkg -x $src ./ftb-app
+
+    runHook postUnpack
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out"
+    cp -r ftb-app/* "$out"
+
+    # Flatten /usr and manually merge lib/ and usr/lib/, since mv refuses to.
+    mv "$out"'/opt/FTB Electron App' "$out/bin"
+    mv "$out/usr/"* "$out/"
+    rmdir "$out/usr"
+    rmdir "$out/opt"
+
+    for f in "$out/share/applications/"*.desktop; do
+       substituteInPlace "$f" \
+           --replace-fail '/opt/FTB Electron App/ftb-app' "$out/bin/ftb-app"
+    done
+
+    # prevent self-upgrade with dpkg
+    rm "$out/bin/resources/package-type"
+
+    chmod +x "$out/bin/ftb-app"
+
+    libs="${nss}/lib/libnss3.so ${nss}/lib/libnssutil3.so ${nss}/lib/libsmime3.so "
+    libs+="${nspr}/lib/libnspr4.so ${dbus.lib}/lib/libdbus-1.so.3 "
+    libs+="${at-spi2-atk}/lib/libatk-1.0.so.0 ${cups.lib}/lib/libcups.so.2 "
+    libs+="${at-spi2-atk}/lib/libatk-bridge-2.0.so.0 "
+    libs+="${libdrm}/lib/libdrm.so.2 ${gtk3}/lib/libgtk-3.so.0 "
+    libs+="${pango.out}/lib/libpango-1.0.so.0 ${cairo}/lib/libcairo.so.2 "
+    libs+="${xorg.libX11}/lib/libX11.so.6 ${xorg.libXext}/lib/libXext.so.6 "
+    libs+="${xorg.libXcomposite}/lib/libXcomposite.so.1 "
+    libs+="${xorg.libXdamage}/lib/libXdamage.so.1 "
+    libs+="${xorg.libXfixes}/lib/libXfixes.so.3 ${expat}/lib/libexpat.so.1 "
+    libs+="${xorg.libXrandr}/lib/libXrandr.so.2  "
+    libs+="${xorg.libxcb}/lib/libxcb.so.1 ${alsa-lib}/lib/libasound.so.2 "
+    libs+="${libxkbcommon}/lib/libxkbcommon.so.0 "
+    libs+="${at-spi2-atk}/lib/libatspi.so.0 ${xorg.libXtst}/lib/libXtst.so.6 "
+    libs+="${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.so.0 ${libgbm}/lib/libgbm.so.1"
+
+    echo "$libs"
+
+
+    for p in "$out/bin/ftb-app"; do
+        wrapProgram "$p" \
+            --set LD_PRELOAD "$libs" \
+            --set NIX_REDIRECTS "/usr/share=$out/share:"'/opt/FTB Electron Application'"=$out/bin" \
+            --set JAVA_HOME "${jre.home}"
+            # --prefix PATH : "{lib.makeBinPath [ gzip gnutar ]}"
+    done
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A new Modpack launcher for FTB and Curse modpacks.";
+    homepage = "https://feed-the-beast.com/app";
+    license = with licenses; [ lgpl21Only ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    maintainers = with rad-maintainers; [ ahuston-0 ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "ftb-app";
+  };
+}

pkgs/lego-latest/default.nix

@@ -2,6 +2,7 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
+  rad-maintainers,
 }:
 
 buildGoModule rec {
@@ -31,7 +32,7 @@ buildGoModule rec {
     description = "Let's Encrypt client and ACME library written in Go";
     license = licenses.mit;
     homepage = "https://go-acme.github.io/lego/";
-    maintainers = teams.acme.members;
+    maintainers = teams.acme.members ++ [ rad-maintainers.ahuston-0 ];
     mainProgram = "lego";
   };
 

pkgs/maintainers.nix

@@ -0,0 +1,77 @@
+/*
+  Borrowed this from nixpkgs :)
+  List of NixOS maintainers.
+   ```nix
+   handle = {
+     # Required
+     name = "Your name";
+
+     # Optional, but at least one of email, matrix or githubId must be given
+     email = "address@example.org";
+     matrix = "@user:example.org";
+     github = "GithubUsername";
+     githubId = your-github-id;
+
+     keys = [{
+       fingerprint = "AAAA BBBB CCCC DDDD EEEE  FFFF 0000 1111 2222 3333";
+     }];
+   };
+   ```
+
+   where
+
+   - `handle` is the handle you are going to use in nixpkgs expressions,
+   - `name` is a name that people would know and recognize you by,
+   - `email` is your maintainer email address,
+   - `matrix` is your Matrix user ID,
+   - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`),
+   - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`,
+   - `keys` is a list of your PGP/GPG key fingerprints.
+
+   Specifying a GitHub account ensures that you automatically:
+   - get invited to the @NixOS/nixpkgs-maintainers team ;
+   - once you are part of the @NixOS org, OfBorg will request you review
+     pull requests that modify a package for which you are a maintainer.
+
+   `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient.
+
+   If `github` begins with a numeral, `handle` should be prefixed with an underscore.
+   ```nix
+   _1example = {
+     github = "1example";
+   };
+   ```
+
+   Add PGP/GPG keys only if you actually use them to sign commits and/or mail.
+
+   To get the required PGP/GPG values for a key run
+   ```shell
+   gpg --fingerprint <email> | head -n 2
+   ```
+
+   !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth.
+
+   More fields may be added in the future, however, in order to comply with GDPR this file should stay as minimal as possible.
+
+   When editing this file:
+    * keep the list alphabetically sorted, check with:
+        nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix
+    * test the validity of the format with:
+        nix-build lib/tests/maintainers.nix
+
+   See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data.
+
+   When adding a new maintainer, be aware of the current commit conventions
+   documented at [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions)
+   file located in the root of the Nixpkgs repo.
+*/
+
+{
+  ahuston-0 = {
+    name = "ahuston-0";
+    email = "aliceghuston@gmail.com";
+    github = "ahuston-0";
+    githubId = 43225907;
+    keys = [ { fingerprint = "F638 32C3 080D 6E1A C77E  ECF8 0B42 45FF E305 BC82"; } ];
+  };
+}

systems/artemision/desktop.nix

@@ -30,6 +30,10 @@
   };
   # Optional, hint electron apps to use wayland:
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
+  xdg.portal = {
+    enable = true;
+    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+  };
 
   services = {
     xserver = {

systems/artemision/programs.nix

@@ -72,6 +72,7 @@
     protontricks
     proxychains
     qrencode
+    rad-pkgs.ftb-app
     redshift
     restic
     ripgrep

systems/palatine-hill/acme.nix

@@ -31,7 +31,7 @@
       openssl
     ]
     ++ [
-      outputs.packages.x86_64-linux.lego-latest
+      outputs.packages.lego-latest
     ]
   );
 

users/alice/home.nix

@@ -76,6 +76,7 @@
       nix-prefetch
       nix-tree
       nh
+      nix-prefetch-scripts
 
       # doom emacs dependencies
       fd
@@ -90,6 +91,7 @@
       nodejs_20
       nodePackages.prettier
       treefmt
+
     ];
   };