summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-11-18 11:45:25 +0000
committerAlyssa Ross <hi@alyssa.is>2021-12-09 23:36:40 +0000
commit9b290d7317e76bce0fb4968976a7c6f4fa6c4208 (patch)
tree3cbe6a70177ba744db80a4b6e93e36d554df08b1
parent99acdfcac00352b6c2dedbb22288e4f90b67eec9 (diff)
downloadnixpkgs-rootfs.tar
nixpkgs-rootfs.tar.gz
nixpkgs-rootfs.tar.bz2
nixpkgs-rootfs.tar.lz
nixpkgs-rootfs.tar.xz
nixpkgs-rootfs.tar.zst
nixpkgs-rootfs.zip
WIP rootfs
-rw-r--r--nixos/modules/services/wayland/cage.nix5
-rw-r--r--pkgs/applications/terminal-emulators/foot/default.nix8
-rw-r--r--pkgs/applications/window-managers/weston/default.nix45
-rw-r--r--pkgs/development/libraries/mesa/default.nix9
-rw-r--r--pkgs/os-specific/linux/libsepol/default.nix4
-rw-r--r--pkgs/tools/misc/colord/default.nix2
6 files changed, 47 insertions, 26 deletions
diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix
index 273693a3b2f..03a893ba076 100644
--- a/nixos/modules/services/wayland/cage.nix
+++ b/nixos/modules/services/wayland/cage.nix
@@ -24,7 +24,7 @@ in {
   };
 
   options.services.cage.program = mkOption {
-    type = types.path;
+    type = types.str;
     default = "${pkgs.xterm}/bin/xterm";
     defaultText = literalExpression ''"''${pkgs.xterm}/bin/xterm"'';
     description = ''
@@ -50,6 +50,7 @@ in {
       wants = [ "dbus.socket" "systemd-logind.service" "plymouth-quit.service"];
       wantedBy = [ "graphical.target" ];
       conflicts = [ "getty@tty1.service" ];
+      environment = { "LIBSEAT_BACKEND" = "logind"; };
 
       restartIfChanged = false;
       unitConfig.ConditionPathExists = "/dev/tty1";
@@ -74,6 +75,8 @@ in {
         TTYVTDisallocate = "yes";
         # Fail to start if not controlling the virtual terminal.
         StandardInput = "tty-fail";
+        StandardOutput = "journal";
+        StandardError = "journal";
         # Set up a full (custom) user session for the user, required by Cage.
         PAMName = "cage";
       };
diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix
index 9290f8ce614..768a98a7590 100644
--- a/pkgs/applications/terminal-emulators/foot/default.nix
+++ b/pkgs/applications/terminal-emulators/foot/default.nix
@@ -94,13 +94,7 @@ stdenv.mkDerivation rec {
   pname = "foot";
   inherit version;
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
-    owner = "dnkl";
-    repo = pname;
-    rev = version;
-    sha256 = "00096c2m8pn4gpafvmg9lhyprwgnsis62bq4qmagnbb49bj5kr9v";
-  };
+  src = builtins.fetchGit /home/src/foot;
 
   depsBuildBuild = [
     pkg-config
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index ea2718d351d..ac97207f68d 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, wayland-scanner
-, wayland, libGL, mesa, libxkbcommon, cairo, libxcb
+{ lib, stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkg-config, wayland-scanner
+, wayland, libGL, mesa, libxkbcommon, cairo, libxcb, python3, seatd
 , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev, pixman
 , colord, lcms2, pipewire ? null
 , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
@@ -12,21 +12,31 @@ stdenv.mkDerivation rec {
   pname = "weston";
   version = "9.0.0";
 
-  src = fetchurl {
-    url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw";
-  };
+  # src = fetchurl {
+  #   url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
+  #   sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw";
+  # };
 
-  patches = [
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/b10c0e843dcb8148bbe869bb15261955b94ac98c.patch";
-      sha256 = "0gbdn9v0ynx4mz0pisn6mrp2vy1hl6jnk5w7qlad6ap3fpwdygxr";
-    })
-  ];
+  # src = fetchFromGitLab {
+  #   domain = "gitlab.freedesktop.org";
+  #   owner = "wayland";
+  #   repo = "weston";
+  #   rev = "348e3a9abddbfa9e6586eba83fc646dd402c613a";
+  #   sha256 = "00pw7vb6kmzabvgc8xinl4ksvzhkbfk203yjizp6zl1rnw9w3yxh";
+  # };
+
+  src = builtins.fetchGit /home/src/weston;
 
-  nativeBuildInputs = [ meson ninja pkg-config /* wayland-scanner */ ];
+  # patches = [
+  #   (fetchpatch {
+  #     url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/b10c0e843dcb8148bbe869bb15261955b94ac98c.patch";
+  #     sha256 = "0gbdn9v0ynx4mz0pisn6mrp2vy1hl6jnk5w7qlad6ap3fpwdygxr";
+  #   })
+  # ];
+
+  nativeBuildInputs = [ meson ninja pkg-config /* wayland-scanner */ python3 ];
   buildInputs = [
-    wayland /* libGL mesa */ libxkbcommon cairo /* libxcb libXcursor xlibsWrapper udev */ libdrm
+    wayland libGL mesa libxkbcommon cairo /* libxcb libXcursor xlibsWrapper udev */ libdrm
     /* mtdev libjpeg pam dbus */ libinput libevdev /* pango libunwind freerdp vaapi libva */ pixman
     /* libwebp */ wayland-protocols
   #   colord lcms2 pipewire
@@ -36,10 +46,11 @@ stdenv.mkDerivation rec {
     "-Dimage-jpeg=false"
     "-Dimage-webp=false"
     "-Dlauncher-logind=false"
+    # "-Dlauncher-libseat=true"
     "-Dweston-launch=false"
-    "-Drenderer-gl=false"
+    # "-Drenderer-gl=false"
     "-Dbackend-drm-screencast-vaapi=false"
-    "-Dbackend-drm=false"
+    # "-Dbackend-drm=false"
     "-Dbackend-default=auto"
     "-Dbackend-rdp=false"
     "-Dxwayland=false"
@@ -50,6 +61,8 @@ stdenv.mkDerivation rec {
     "-Dsimple-clients="
     "-Ddemo-clients=false"
     "-Dtest-junit-xml=false"
+    "-Dsystemd=false"
+    "-Dlauncher-logind=false"
   ];
 
   # mesonFlags= [
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 97b5613ea26..3630ebd2746 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -74,6 +74,15 @@ self = stdenv.mkDerivation {
     # Fix aarch64-darwin build, remove when upstreaam supports it out of the box.
     # See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020
     ./aarch64-darwin.patch
+  ] ++ optionals (stdenv.hostPlatform.isMusl) [
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/2bc8e601b9120becd2ced18a8803bbed2641ba56.patch";
+      sha256 = "1b17z9w8snm9clw2x5byjqpwnx2pz1xksib5zvc1s68vcf6p86h3";
+    })
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/971853569f7084a89be79aad76178234ce07adad.patch";
+      sha256 = "1lkw5cc0p7lm67db1qnn3fz1lsgdnszg40dig3s5rfsg4gjdzg6m";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index c1df217944c..b86c183a147 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
     "MAN3DIR=$(man)/share/man/man3"
     "MAN8DIR=$(man)/share/man/man8"
     "SHLIBDIR=$(out)/lib"
-  ];
+  ] ++ lib.optional stdenv.hostPlatform.isStatic "DISABLE_SHARED=y";
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
-  passthru = { inherit se_url; };
+  enableParallelBuilding = true;
 
   meta = with lib; {
     description = "SELinux binary policy manipulation library";
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 89435332c9c..6e484b22966 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -25,6 +25,7 @@
 , docbook_xml_dtd_412
 , gtk-doc
 , libxslt
+, enableDaemon ? true
 }:
 
 stdenv.mkDerivation rec {
@@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
     "-Dlibcolordcompat=true"
     "-Dsane=true"
     "-Dvapi=true"
+    "-Ddaemon=${lib.boolToString enableDaemon}"
     "-Ddaemon_user=colord"
   ];