From 766ea89722c3497ea6c89a790954b2373e1b8aca Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Wed, 19 Dec 2018 22:49:00 +0100 Subject: [PATCH 01/10] rspamd: /var/run -> /run --- pkgs/servers/mail/rspamd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index a8c09945fa92..a38b0082dc2f 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDEBIAN_BUILD=ON" - "-DRUNDIR=/var/run/rspamd" + "-DRUNDIR=/run/rspamd" "-DDBDIR=/var/lib/rspamd" "-DLOGDIR=/var/log/rspamd" "-DLOCAL_CONFDIR=/etc/rspamd" From 15d239fa2c8cbdd0c769c0f4dbc69fbf02b7011d Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Wed, 19 Dec 2018 22:49:40 +0100 Subject: [PATCH 02/10] network-manager: /var/run -> /run --- pkgs/tools/networking/network-manager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 1695e23514a9..78aeb2a03edd 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { installFlags = [ "sysconfdir=${placeholder "out"}/etc" "localstatedir=${placeholder "out"}/var" - "runstatedir=${placeholder "out"}/var/run" + "runstatedir=${placeholder "out"}/run" ]; postInstall = '' From 74048e5c93858e5cba259f9a9ec7fcf0d9642d43 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 24 Mar 2019 20:47:08 +0100 Subject: [PATCH 03/10] gimp: /var/run -> /run --- pkgs/applications/graphics/gimp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 9e4aec16db88..657a9dd27e50 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--without-webkit" # old version is required "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" - "--with-icc-directory=/var/run/current-system/sw/share/color/icc" + "--with-icc-directory=/run/current-system/sw/share/color/icc" ]; # on Darwin, From 9e40609da7f51258cc7e1319c380fcea0220b516 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 24 Mar 2019 20:47:23 +0100 Subject: [PATCH 04/10] udisks: /var/run -> /run --- pkgs/os-specific/linux/udisks/1-default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index d48c21f6b52a..03c48867b342 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace src/main.c --replace \ "/sbin:/bin:/usr/sbin:/usr/bin" \ - "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/bin" + "${utillinux}/bin:${mdadm}/sbin:/run/current-system/sw/bin:/run/current-system/sw/bin" ''; buildInputs = From 81318908a5b28f53c11464b6ad9939405493e3b2 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 24 Mar 2019 20:47:44 +0100 Subject: [PATCH 05/10] util-linux: /var/run -> /run --- pkgs/os-specific/linux/util-linux/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index ec18c25ee665..3e94ba5c1ea2 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { "--enable-last" "--enable-mesg" "--disable-use-tty-group" - "--enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin" + "--enable-fs-paths-default=/run/wrappers/bin:/run/current-system/sw/bin:/sbin" "--disable-makeinstall-setuid" "--disable-makeinstall-chown" (lib.withFeature (ncurses != null) "ncursesw") (lib.withFeature (systemd != null) "systemd") From 2b5a3087fff4bd435e3221f6766df647d3f81763 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 24 Mar 2019 20:47:56 +0100 Subject: [PATCH 06/10] libmaa: /var/run -> /run --- pkgs/servers/dict/libmaa.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix index 3c04a678def5..f5c0cf230af3 100644 --- a/pkgs/servers/dict/libmaa.nix +++ b/pkgs/servers/dict/libmaa.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool ]; - # configureFlags = [ "--datadir=/var/run/current-system/share/dictd" ]; + # configureFlags = [ "--datadir=/run/current-system/share/dictd" ]; meta = with stdenv.lib; { description = "Dict protocol server and client"; From a91ec565366ebf81b44712d61eca65a5fc9b056d Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 24 Mar 2019 20:48:06 +0100 Subject: [PATCH 07/10] timidity: /var/run -> /run --- pkgs/tools/misc/timidity/timidity.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/timidity/timidity.cfg b/pkgs/tools/misc/timidity/timidity.cfg index fda915729ae5..fa07eb43eee6 100644 --- a/pkgs/tools/misc/timidity/timidity.cfg +++ b/pkgs/tools/misc/timidity/timidity.cfg @@ -41,8 +41,8 @@ # point to the library directory: # -dir /var/run/current-system/sw/share/timidity/instruments -dir /var/run/current-system/sw/share/timidity/patch +dir /run/current-system/sw/share/timidity/instruments +dir /run/current-system/sw/share/timidity/patch ############################################################################## # This sets up the default patches in the TiMidity support package From 24ca25a117075801cb100319108b6a71da03ee8a Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Wed, 19 Dec 2018 22:54:12 +0100 Subject: [PATCH 08/10] bareos: /var/run -> /run --- pkgs/tools/backup/bareos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 5cf675a9af10..ad0001f22e17 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { "--with-working-dir=/var/lib/bareos" "--with-bsrdir=/var/lib/bareos" "--with-logdir=/var/log/bareos" - "--with-pid-dir=/var/run/bareos" - "--with-subsys-dir=/var/run/bareos" + "--with-pid-dir=/run/bareos" + "--with-subsys-dir=/run/bareos" "--enable-ndmp" "--enable-lmdb" "--enable-batch-insert" From b2f2707ca80c411b4acdcbd8d2721a58f35bd870 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 24 Mar 2019 21:14:30 +0100 Subject: [PATCH 09/10] wicd: /var/run -> /run --- pkgs/tools/networking/wicd/wpa2-ttls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/wicd/wpa2-ttls b/pkgs/tools/networking/wicd/wpa2-ttls index c5ac798be5df..650375cbbaae 100644 --- a/pkgs/tools/networking/wicd/wpa2-ttls +++ b/pkgs/tools/networking/wicd/wpa2-ttls @@ -4,7 +4,7 @@ version = 1 require identity *Identity anonymous_identity *Anonymous_identity password *Password ca_cert *Path_to_CA_Cert protected password *Password ----- -ctrl_interface=/var/run/wpa_supplicant +ctrl_interface=/run/wpa_supplicant network={ ssid="$_ESSID" scan_ssid=$_SCAN From 65710feb5c03b0e999ce32e60f18bc0f77b7978f Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 24 Mar 2019 21:13:30 +0100 Subject: [PATCH 10/10] asterisk: /var/run -> /run --- pkgs/servers/asterisk/runtime-vardirs.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/asterisk/runtime-vardirs.patch b/pkgs/servers/asterisk/runtime-vardirs.patch index 17959bac9a07..498c62ee4d88 100644 --- a/pkgs/servers/asterisk/runtime-vardirs.patch +++ b/pkgs/servers/asterisk/runtime-vardirs.patch @@ -5,7 +5,7 @@ diff -rupN asterisk-14.1.2/build_tools/make_defaults_h asterisk-14.1.2-patched/b #!/bin/sh + +ASTLOGDIR=/var/log/asterisk -+ASTVARRUNDIR=/var/run/asterisk ++ASTVARRUNDIR=/run/asterisk +ASTVARLIBDIR=/var/lib/asterisk +ASTDBDIR=${ASTVARLIBDIR} +ASTDATADIR=${ASTVARLIBDIR}