JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #58222 from bobvanderlinden/var-run-pkgs

Browse Source 
tree-wide: pkgs: /var/run -> /run
This commit is contained in:
Frederik Rietdijk 2019-04-16 19:02:56 +02:00 committed by GitHub
commit 2b52da5f99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/gimp/default.nix
View File

@ -69,7 +69,7 @@ in stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--without-webkit" # old version is required "--without-webkit" # old version is required
"--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" "--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, # on Darwin,

2
pkgs/os-specific/linux/udisks/1-default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
substituteInPlace src/main.c --replace \ substituteInPlace src/main.c --replace \
"/sbin:/bin:/usr/sbin:/usr/bin" \ "/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 = buildInputs =

2
pkgs/os-specific/linux/util-linux/default.nix
View File

@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
"--enable-last" "--enable-last"
"--enable-mesg" "--enable-mesg"
"--disable-use-tty-group" "--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" "--disable-makeinstall-setuid" "--disable-makeinstall-chown"
(lib.withFeature (ncurses != null) "ncursesw") (lib.withFeature (ncurses != null) "ncursesw")
(lib.withFeature (systemd != null) "systemd") (lib.withFeature (systemd != null) "systemd")

2
pkgs/servers/asterisk/runtime-vardirs.patch
View File

@ -5,7 +5,7 @@ diff -rupN asterisk-14.1.2/build_tools/make_defaults_h asterisk-14.1.2-patched/b
#!/bin/sh #!/bin/sh
+ +
+ASTLOGDIR=/var/log/asterisk +ASTLOGDIR=/var/log/asterisk
+ASTVARRUNDIR=/var/run/asterisk +ASTVARRUNDIR=/run/asterisk
+ASTVARLIBDIR=/var/lib/asterisk +ASTVARLIBDIR=/var/lib/asterisk
+ASTDBDIR=${ASTVARLIBDIR} +ASTDBDIR=${ASTVARLIBDIR}
+ASTDATADIR=${ASTVARLIBDIR} +ASTDATADIR=${ASTVARLIBDIR}

2
pkgs/servers/dict/libmaa.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ libtool ]; buildInputs = [ libtool ];
# configureFlags = [ "--datadir=/var/run/current-system/share/dictd" ]; # configureFlags = [ "--datadir=/run/current-system/share/dictd" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Dict protocol server and client"; description = "Dict protocol server and client";

2
pkgs/servers/mail/rspamd/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DDEBIAN_BUILD=ON" "-DDEBIAN_BUILD=ON"
"-DRUNDIR=/var/run/rspamd" "-DRUNDIR=/run/rspamd"
"-DDBDIR=/var/lib/rspamd" "-DDBDIR=/var/lib/rspamd"
"-DLOGDIR=/var/log/rspamd" "-DLOGDIR=/var/log/rspamd"
"-DLOCAL_CONFDIR=/etc/rspamd" "-DLOCAL_CONFDIR=/etc/rspamd"

4
pkgs/tools/backup/bareos/default.nix
View File

@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
"--with-working-dir=/var/lib/bareos" "--with-working-dir=/var/lib/bareos"
"--with-bsrdir=/var/lib/bareos" "--with-bsrdir=/var/lib/bareos"
"--with-logdir=/var/log/bareos" "--with-logdir=/var/log/bareos"
"--with-pid-dir=/var/run/bareos" "--with-pid-dir=/run/bareos"
"--with-subsys-dir=/var/run/bareos" "--with-subsys-dir=/run/bareos"
"--enable-ndmp" "--enable-ndmp"
"--enable-lmdb" "--enable-lmdb"
"--enable-batch-insert" "--enable-batch-insert"

4
pkgs/tools/misc/timidity/timidity.cfg
View File

@ -41,8 +41,8 @@
# point to the library directory: # point to the library directory:
# #
dir /var/run/current-system/sw/share/timidity/instruments dir /run/current-system/sw/share/timidity/instruments
dir /var/run/current-system/sw/share/timidity/patch dir /run/current-system/sw/share/timidity/patch
############################################################################## ##############################################################################
# This sets up the default patches in the TiMidity support package # This sets up the default patches in the TiMidity support package

2
pkgs/tools/networking/network-manager/default.nix
View File

@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
installFlags = [ installFlags = [
"sysconfdir=${placeholder "out"}/etc" "sysconfdir=${placeholder "out"}/etc"
"localstatedir=${placeholder "out"}/var" "localstatedir=${placeholder "out"}/var"
"runstatedir=${placeholder "out"}/var/run" "runstatedir=${placeholder "out"}/run"
]; ];
postInstall = '' postInstall = ''

2
pkgs/tools/networking/wicd/wpa2-ttls
View File

@ -4,7 +4,7 @@ version = 1
require identity *Identity anonymous_identity *Anonymous_identity password *Password ca_cert *Path_to_CA_Cert require identity *Identity anonymous_identity *Anonymous_identity password *Password ca_cert *Path_to_CA_Cert
protected password *Password protected password *Password
----- -----
ctrl_interface=/var/run/wpa_supplicant ctrl_interface=/run/wpa_supplicant
network={ network={
ssid="$_ESSID" ssid="$_ESSID"
scan_ssid=$_SCAN scan_ssid=$_SCAN