Skip to content

treewide: don't use single quotes with placeholder #68016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
worldofpeace merged 1 commit into from
Sep 3, 2019
Merged

treewide: don't use single quotes with placeholder #68016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/applications/display-managers/lightdm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
++ optional withQt5 "--enable-liblightdm-qt5";

installFlags = [
"sysconfdir=${placeholder ''out''}/etc"
"sysconfdir=${placeholder "out"}/etc"
"localstatedir=\${TMPDIR}"
];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/gpscorrelate/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
];

makeFlags = [
"prefix=${placeholder ''out''}"
"prefix=${placeholder "out"}"
"GTK=3"
"CC=cc"
"CXX=c++"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/kjv/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
patches = [ add-apocrypha add-install-target ];

makeFlags = [
"PREFIX=${placeholder ''out''}"
"PREFIX=${placeholder "out"}"
];

meta = with stdenv.lib; {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/misc/plank/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ stdenv.mkDerivation rec {

# fix paths
makeFlags = [
"INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/"
"INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
"INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0/"
"INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
];

# Make plank's application launcher hidden in Pantheon
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/misc/web-media-controller/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ glib pcre json-glib ];
cmakeFlags = [
"-DCHROMIUM_MANIFEST_DESTINATION=${placeholder ''out''}/etc/chromium/native-messaging-hosts"
"-DCHROME_MANIFEST_DESTINATION=${placeholder ''out''}/etc/opt/chrome/native-messaging-hosts"
"-DFIREFOX_MANIFEST_DESTINATION=${placeholder ''out''}/lib/mozilla/native-messaging-hosts"
"-DCHROMIUM_MANIFEST_DESTINATION=${placeholder "out"}/etc/chromium/native-messaging-hosts"
"-DCHROME_MANIFEST_DESTINATION=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts"
"-DFIREFOX_MANIFEST_DESTINATION=${placeholder "out"}/lib/mozilla/native-messaging-hosts"
];

meta = with stdenv.lib; {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/networking/dropbox/cli.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ stdenv.mkDerivation {
];

configureFlags = [
"--with-nautilus-extension-dir=${placeholder ''nautilusExtension''}/lib/nautilus/extensions-3.0"
"--with-nautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-3.0"
];

makeFlags = [
"EMBLEM_DIR=${placeholder ''nautilusExtension''}/share/nautilus-dropbox/emblems"
"EMBLEM_DIR=${placeholder "nautilusExtension"}/share/nautilus-dropbox/emblems"
];

meta = {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/science/electronics/fped/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

# This uses '/bin/bash', '/usr/local' and 'lex' by default
makeFlags = [
"PREFIX=${placeholder ''out''}"
"PREFIX=${placeholder "out"}"
"LEX=flex"
"RGBDEF=${netpbm}/share/netpbm/misc/rgb.txt"
];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';

makeFlags = [
"PREFIX=${placeholder ''out''}"
"PREFIX=${placeholder "out"}"
"ENABLE_MAN=yes"
"DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl"
];
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
];

makeFlags = [
"PREFIX=${placeholder ''out''}"
"INSTALL_LIB=${placeholder ''out''}/bin"
"INSTALL_MAN=${placeholder ''out''}/share/man/man1"
"PREFIX=${placeholder "out"}"
"INSTALL_LIB=${placeholder "out"}/bin"
"INSTALL_MAN=${placeholder "out"}/share/man/man1"
];

patches = [
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/deepin/dbus-factory/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
go-dbus-generator
];

makeFlags = [ "GOPATH=${placeholder ''out''}/share/go" ];
makeFlags = [ "GOPATH=${placeholder "out"}/share/go" ];

postPatch = ''
sed -i -e 's:/share/gocode:/share/go:' Makefile
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/deepin/deepin-anything/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ mkDerivation rec {

makeFlags = [
"DEB_HOST_MULTIARCH="
"PREFIX=${placeholder ''out''}"
"PREFIX=${placeholder "out"}"
];

postPatch = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
# fix default background url
sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \
overrides/common/com.deepin.wrap.gnome.desktop.override

fixPath ${deepin-wallpapers} /usr/share/backgrounds \
overrides/common/com.deepin.wrap.gnome.desktop.override

Expand All @@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
# /usr/share/desktop-directories
'';

makeFlags = [ "PREFIX=${placeholder ''out''}" ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];

doCheck = true;
checkTarget = "test";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/deepin/deepin-gettext-tools/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
python3Packages.python
];

makeFlags = [ "PREFIX=${placeholder ''out''}" ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];

postPatch = ''
sed -e 's/sudo cp/cp/' -i src/generate_mo.py
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/deepin/deepin-gtk-theme/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

propagatedUserEnvPkgs = [ gtk-engine-murrine ];

makeFlags = [ "PREFIX=${placeholder ''out''}" ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];

passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };

Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/deepin/deepin-icon-theme/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ stdenv.mkDerivation rec {

buildTargets = "all hicolor-links";
installTargets = "install-icons install-cursors";
installFlags = [ "PREFIX=${placeholder ''out''}" ];
installFlags = [ "PREFIX=${placeholder "out"}" ];

postInstall = ''
cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/deepin/deepin-sound-theme/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9";
};

makeFlags = [ "PREFIX=${placeholder ''out''}" ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];

passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };

Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/deepin/go-dbus-factory/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f";
};

makeFlags = [ "PREFIX=${placeholder ''out''}" ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];

postPatch = ''
sed -i -e 's:/share/gocode:/share/go:' Makefile
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/deepin/go-dbus-generator/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
];

makeFlags = [
"PREFIX=${placeholder ''out''}"
"PREFIX=${placeholder "out"}"
"GOCACHE=$(TMPDIR)/go-cache"
];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/deepin/go-gir-generator/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';

makeFlags = [
"PREFIX=${placeholder ''out''}"
"PREFIX=${placeholder "out"}"
"GOCACHE=$(TMPDIR)/go-cache"
];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ mkDerivation rec {
];

qmakeFlags = [
"INSTALL_PATH=${placeholder ''out''}/${qtbase.qtPluginPrefix}/platforms"
"INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms"
];

enableParallelBuilding = true;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
];

configureFlags = [
"--with-pkcs11-config=${placeholder ''out''}/etc/pkcs11/" # installation directories
"--with-pkcs11-modules=${placeholder ''out''}/lib/pkcs11/"
"--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories
"--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/"
];

postPatch = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-httpd=${apacheHttpd.out}/bin/httpd"
"--with-modules-path=${apacheHttpd.dev}/modules"
"--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user"
"--with-nautilusdir=${placeholder ''out''}/lib/nautilus/extensions-3.0"
"--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
"--with-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0"
];

nativeBuildInputs = [
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
uuid = "taskwhisperer-extension@infinicode.de";

makeFlags = [
"INSTALLBASE=${placeholder ''out''}/share/gnome-shell/extensions"
"INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions"
];

patches = [
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
doCheck = true;

configureFlags = [
"--with-libpanel-applet-dir=${placeholder ''out''}/share/gnome-panel/applets"
"--with-libpanel-applet-dir=${placeholder "out"}/share/gnome-panel/applets"
];

passthru = {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
switchboard
];

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

meta = with stdenv.lib; {
description = "Switchboard Universal Access Plug";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
./remove-update-button.patch
];

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

meta = with stdenv.lib; {
description = "Switchboard About Plug";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
switchboard
];

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

meta = with stdenv.lib; {
description = "Switchboard Applications Plug";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
switchboard
];

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

meta = with stdenv.lib; {
description = "Switchboard Bluetooth Plug";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
./clock-format.patch
];

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

meta = with stdenv.lib; {
description = "Switchboard Date & Time Plug";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
switchboard
];

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

meta = with stdenv.lib; {
description = "Switchboard Displays Plug";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
})
];

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

meta = with stdenv.lib; {
description = "Switchboard Keyboard Plug";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
switchboard
];

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

meta = with stdenv.lib; {
description = "Switchboard Mouse & Touchpad Plug";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
];


PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

meta = with stdenv.lib; {
description = "Switchboard Networking Plug";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
switchboard
];

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

meta = with stdenv.lib; {
description = "Switchboard Notifications Plug";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
'';


PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

meta = with stdenv.lib; {
description = "Switchboard Desktop Plug";
Expand Down
8 changes: 4 additions & 4 deletions pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ stdenv.mkDerivation rec {
--subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas
'';

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "${placeholder ''out''}/share/dbus-1/system-services";
PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder ''out''}/etc";
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder ''out''}/share/polkit-1/actions";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/system-services";
PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder "out"}/etc";
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";

meta = with stdenv.lib; {
description = "Switchboard Power Plug";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
switchboard
];

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

meta = with stdenv.lib; {
description = "Switchboard Printers Plug";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
zeitgeist
];

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

patches = [
./hardcode-gsettings.patch
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
switchboard
];

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

meta = with stdenv.lib; {
description = "Switchboard Sharing Plug";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
switchboard
];

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

meta = with stdenv.lib; {
description = "Switchboard Sound Plug";
Expand Down
Loading