From 2b7d6e463e0d278b4811c2a270814342fd1abf94 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 24 Sep 2018 14:39:57 -0500 Subject: [PATCH 1/2] =?UTF-8?q?nixos:=20don=E2=80=99t=20enableQt4Support?= =?UTF-8?q?=20for=20installer=20profile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is already done in installer/cd-dvd/installation-cd-graphical-kde.nix but not in profiles/graphical.nix. Related to #47256. --- nixos/modules/profiles/graphical.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index 332cf58aa538..8d9fcba82067 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/nixos/modules/profiles/graphical.nix @@ -7,7 +7,10 @@ services.xserver = { enable = true; displayManager.sddm.enable = true; - desktopManager.plasma5.enable = true; + desktopManager.plasma5 = { + enable = true; + enableQt4Support = false; + }; libinput.enable = true; # for touchpad support on many laptops }; From 1427c50cea8685daf8eb571301651cf347b27e23 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 24 Sep 2018 15:05:39 -0500 Subject: [PATCH 2/2] nfs-utils: properly strip system-generators MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit nfs-utils had a dependency on gcc through etc/systemd/system-generators/*-server-generator. It was not stripped correctly because it’s not in an expected path. This adds it to the strip list. --- pkgs/os-specific/linux/nfs-utils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index f67663b31061..657f17c16849 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -83,6 +83,8 @@ in stdenv.mkDerivation rec { "statdpath=$(TMPDIR)" ]; + stripDebugList = [ "lib" "libexec" "bin" "etc/systemd/system-generators" ]; + postInstall = '' # Not used on NixOS