nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #68016 from worldofpeace/no-single-quote-placeholder

Browse Source 
treewide: don't use single quotes with placeholder
This commit is contained in:
worldofpeace 2019-09-03 13:02:42 -04:00 committed by GitHub
commit 26b8a0a940
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
74 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/display-managers/lightdm/default.nix
View File

@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
++ optional withQt5 "--enable-liblightdm-qt5"; ++ optional withQt5 "--enable-liblightdm-qt5";
installFlags = [ installFlags = [
"sysconfdir=${placeholder ''out''}/etc" "sysconfdir=${placeholder "out"}/etc"
"localstatedir=\${TMPDIR}" "localstatedir=\${TMPDIR}"
]; ];

2
pkgs/applications/misc/gpscorrelate/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
]; ];
makeFlags = [ makeFlags = [
"prefix=${placeholder ''out''}" "prefix=${placeholder "out"}"
"GTK=3" "GTK=3"
"CC=cc" "CC=cc"
"CXX=c++" "CXX=c++"

2
pkgs/applications/misc/kjv/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
patches = [ add-apocrypha add-install-target ]; patches = [ add-apocrypha add-install-target ];
makeFlags = [ makeFlags = [
"PREFIX=${placeholder ''out''}" "PREFIX=${placeholder "out"}"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/applications/misc/plank/default.nix
View File

@ -64,8 +64,8 @@ stdenv.mkDerivation rec {
# fix paths # fix paths
makeFlags = [ makeFlags = [
"INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/" "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0/"
"INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
]; ];
# Make plank's application launcher hidden in Pantheon # Make plank's application launcher hidden in Pantheon

6
pkgs/applications/misc/web-media-controller/default.nix
View File

@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ glib pcre json-glib ]; buildInputs = [ glib pcre json-glib ];
cmakeFlags = [ cmakeFlags = [
"-DCHROMIUM_MANIFEST_DESTINATION=${placeholder ''out''}/etc/chromium/native-messaging-hosts" "-DCHROMIUM_MANIFEST_DESTINATION=${placeholder "out"}/etc/chromium/native-messaging-hosts"
"-DCHROME_MANIFEST_DESTINATION=${placeholder ''out''}/etc/opt/chrome/native-messaging-hosts" "-DCHROME_MANIFEST_DESTINATION=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts"
"-DFIREFOX_MANIFEST_DESTINATION=${placeholder ''out''}/lib/mozilla/native-messaging-hosts" "-DFIREFOX_MANIFEST_DESTINATION=${placeholder "out"}/lib/mozilla/native-messaging-hosts"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/applications/networking/dropbox/cli.nix
View File

@ -53,11 +53,11 @@ stdenv.mkDerivation {
]; ];
configureFlags = [ configureFlags = [
"--with-nautilus-extension-dir=${placeholder ''nautilusExtension''}/lib/nautilus/extensions-3.0" "--with-nautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-3.0"
]; ];
makeFlags = [ makeFlags = [
"EMBLEM_DIR=${placeholder ''nautilusExtension''}/share/nautilus-dropbox/emblems" "EMBLEM_DIR=${placeholder "nautilusExtension"}/share/nautilus-dropbox/emblems"
]; ];
meta = { meta = {

2
pkgs/applications/science/electronics/fped/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# This uses '/bin/bash', '/usr/local' and 'lex' by default # This uses '/bin/bash', '/usr/local' and 'lex' by default
makeFlags = [ makeFlags = [
"PREFIX=${placeholder ''out''}" "PREFIX=${placeholder "out"}"
"LEX=flex" "LEX=flex"
"RGBDEF=${netpbm}/share/netpbm/misc/rgb.txt" "RGBDEF=${netpbm}/share/netpbm/misc/rgb.txt"
]; ];

2
pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
''; '';
makeFlags = [ makeFlags = [
"PREFIX=${placeholder ''out''}" "PREFIX=${placeholder "out"}"
"ENABLE_MAN=yes" "ENABLE_MAN=yes"
"DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl" "DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl"
]; ];

6
pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
View File

@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
]; ];
makeFlags = [ makeFlags = [
"PREFIX=${placeholder ''out''}" "PREFIX=${placeholder "out"}"
"INSTALL_LIB=${placeholder ''out''}/bin" "INSTALL_LIB=${placeholder "out"}/bin"
"INSTALL_MAN=${placeholder ''out''}/share/man/man1" "INSTALL_MAN=${placeholder "out"}/share/man/man1"
]; ];
patches = [ patches = [

2
pkgs/desktops/deepin/dbus-factory/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
go-dbus-generator go-dbus-generator
]; ];
makeFlags = [ "GOPATH=${placeholder ''out''}/share/go" ]; makeFlags = [ "GOPATH=${placeholder "out"}/share/go" ];
postPatch = '' postPatch = ''
sed -i -e 's:/share/gocode:/share/go:' Makefile sed -i -e 's:/share/gocode:/share/go:' Makefile

2
pkgs/desktops/deepin/deepin-anything/default.nix
View File

@ -30,7 +30,7 @@ mkDerivation rec {
makeFlags = [ makeFlags = [
"DEB_HOST_MULTIARCH=" "DEB_HOST_MULTIARCH="
"PREFIX=${placeholder ''out''}" "PREFIX=${placeholder "out"}"
]; ];
postPatch = '' postPatch = ''

4
pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
# fix default background url # fix default background url
sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \ sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \
overrides/common/com.deepin.wrap.gnome.desktop.override overrides/common/com.deepin.wrap.gnome.desktop.override
fixPath ${deepin-wallpapers} /usr/share/backgrounds \ fixPath ${deepin-wallpapers} /usr/share/backgrounds \
overrides/common/com.deepin.wrap.gnome.desktop.override overrides/common/com.deepin.wrap.gnome.desktop.override
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
# /usr/share/desktop-directories # /usr/share/desktop-directories
''; '';
makeFlags = [ "PREFIX=${placeholder ''out''}" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ];
doCheck = true; doCheck = true;
checkTarget = "test"; checkTarget = "test";

2
pkgs/desktops/deepin/deepin-gettext-tools/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
python3Packages.python python3Packages.python
]; ];
makeFlags = [ "PREFIX=${placeholder ''out''}" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ];
postPatch = '' postPatch = ''
sed -e 's/sudo cp/cp/' -i src/generate_mo.py sed -e 's/sudo cp/cp/' -i src/generate_mo.py

2
pkgs/desktops/deepin/deepin-gtk-theme/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
makeFlags = [ "PREFIX=${placeholder ''out''}" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ];
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };

2
pkgs/desktops/deepin/deepin-icon-theme/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildTargets = "all hicolor-links"; buildTargets = "all hicolor-links";
installTargets = "install-icons install-cursors"; installTargets = "install-icons install-cursors";
installFlags = [ "PREFIX=${placeholder ''out''}" ]; installFlags = [ "PREFIX=${placeholder "out"}" ];
postInstall = '' postInstall = ''
cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/ cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/

2
pkgs/desktops/deepin/deepin-sound-theme/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9"; sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9";
}; };
makeFlags = [ "PREFIX=${placeholder ''out''}" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ];
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };

2
pkgs/desktops/deepin/go-dbus-factory/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f"; sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f";
}; };
makeFlags = [ "PREFIX=${placeholder ''out''}" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ];
postPatch = '' postPatch = ''
sed -i -e 's:/share/gocode:/share/go:' Makefile sed -i -e 's:/share/gocode:/share/go:' Makefile

2
pkgs/desktops/deepin/go-dbus-generator/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
]; ];
makeFlags = [ makeFlags = [
"PREFIX=${placeholder ''out''}" "PREFIX=${placeholder "out"}"
"GOCACHE=$(TMPDIR)/go-cache" "GOCACHE=$(TMPDIR)/go-cache"
]; ];

2
pkgs/desktops/deepin/go-gir-generator/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
''; '';
makeFlags = [ makeFlags = [
"PREFIX=${placeholder ''out''}" "PREFIX=${placeholder "out"}"
"GOCACHE=$(TMPDIR)/go-cache" "GOCACHE=$(TMPDIR)/go-cache"
]; ];

2
pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
View File

@ -25,7 +25,7 @@ mkDerivation rec {
]; ];
qmakeFlags = [ qmakeFlags = [
"INSTALL_PATH=${placeholder ''out''}/${qtbase.qtPluginPrefix}/platforms" "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
View File

@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
]; ];
configureFlags = [ configureFlags = [
"--with-pkcs11-config=${placeholder ''out''}/etc/pkcs11/" # installation directories "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories
"--with-pkcs11-modules=${placeholder ''out''}/lib/pkcs11/" "--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/"
]; ];
postPatch = '' postPatch = ''

4
pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
View File

@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-httpd=${apacheHttpd.out}/bin/httpd" "--with-httpd=${apacheHttpd.out}/bin/httpd"
"--with-modules-path=${apacheHttpd.dev}/modules" "--with-modules-path=${apacheHttpd.dev}/modules"
"--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user" "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
"--with-nautilusdir=${placeholder ''out''}/lib/nautilus/extensions-3.0" "--with-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0"
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

2
pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
uuid = "taskwhisperer-extension@infinicode.de"; uuid = "taskwhisperer-extension@infinicode.de";
makeFlags = [ makeFlags = [
"INSTALLBASE=${placeholder ''out''}/share/gnome-shell/extensions" "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions"
]; ];
patches = [ patches = [

2
pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
View File

@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
configureFlags = [ configureFlags = [
"--with-libpanel-applet-dir=${placeholder ''out''}/share/gnome-panel/applets" "--with-libpanel-applet-dir=${placeholder "out"}/share/gnome-panel/applets"
]; ];
passthru = { passthru = {

2
pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
View File

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
switchboard 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; { meta = with stdenv.lib; {
description = "Switchboard Universal Access Plug"; description = "Switchboard Universal Access Plug";

2
pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
View File

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
./remove-update-button.patch ./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; { meta = with stdenv.lib; {
description = "Switchboard About Plug"; description = "Switchboard About Plug";

2
pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
View File

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
switchboard 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; { meta = with stdenv.lib; {
description = "Switchboard Applications Plug"; description = "Switchboard Applications Plug";

2
pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
switchboard 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; { meta = with stdenv.lib; {
description = "Switchboard Bluetooth Plug"; description = "Switchboard Bluetooth Plug";

2
pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
./clock-format.patch ./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; { meta = with stdenv.lib; {
description = "Switchboard Date & Time Plug"; description = "Switchboard Date & Time Plug";

2
pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
View File

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
switchboard 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; { meta = with stdenv.lib; {
description = "Switchboard Displays Plug"; description = "Switchboard Displays Plug";

2
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
View File

@ -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; { meta = with stdenv.lib; {
description = "Switchboard Keyboard Plug"; description = "Switchboard Keyboard Plug";

2
pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
View File

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
switchboard 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; { meta = with stdenv.lib; {
description = "Switchboard Mouse & Touchpad Plug"; description = "Switchboard Mouse & Touchpad Plug";

2
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
View File

@ -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; { meta = with stdenv.lib; {
description = "Switchboard Networking Plug"; description = "Switchboard Networking Plug";

2
pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
View File

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
switchboard 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; { meta = with stdenv.lib; {
description = "Switchboard Notifications Plug"; description = "Switchboard Notifications Plug";

2
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
View File

@ -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; { meta = with stdenv.lib; {
description = "Switchboard Desktop Plug"; description = "Switchboard Desktop Plug";

8
pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
View File

@ -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 --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_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_SYSTEM_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/system-services";
PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder ''out''}/etc"; PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder "out"}/etc";
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder ''out''}/share/polkit-1/actions"; PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Switchboard Power Plug"; description = "Switchboard Power Plug";

2
pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
switchboard 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; { meta = with stdenv.lib; {
description = "Switchboard Printers Plug"; description = "Switchboard Printers Plug";

2
pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
zeitgeist zeitgeist
]; ];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
patches = [ patches = [
./hardcode-gsettings.patch ./hardcode-gsettings.patch

2
pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
View File

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
switchboard 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; { meta = with stdenv.lib; {
description = "Switchboard Sharing Plug"; description = "Switchboard Sharing Plug";

2
pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
View File

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
switchboard 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; { meta = with stdenv.lib; {
description = "Switchboard Sound Plug"; description = "Switchboard Sound Plug";

6
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
View File

@ -70,11 +70,11 @@ stdenv.mkDerivation rec {
]; ];
mesonFlags = [ mesonFlags = [
"--sysconfdir=${placeholder ''out''}/etc" "--sysconfdir=${placeholder "out"}/etc"
]; ];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
patches = [ patches = [
(substituteAll { (substituteAll {

2
pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
View File

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
wingpanel wingpanel
]; ];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
postPatch = '' postPatch = ''
chmod +x meson/post_install.py chmod +x meson/post_install.py

2
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
View File

@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
}) })
]; ];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
postPatch = '' postPatch = ''
chmod +x meson/post_install.py chmod +x meson/post_install.py

2
pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
View File

@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
}) })
]; ];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Keyboard Indicator for Wingpanel"; description = "Keyboard Indicator for Wingpanel";

2
pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
View File

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
wingpanel wingpanel
]; ];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Network Indicator for Wingpanel"; description = "Network Indicator for Wingpanel";

2
pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
View File

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
wingpanel wingpanel
]; ];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Night Light Indicator for Wingpanel"; description = "Night Light Indicator for Wingpanel";

2
pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
View File

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
wingpanel wingpanel
]; ];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Notifications Indicator for Wingpanel"; description = "Notifications Indicator for Wingpanel";

2
pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
View File

@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
wingpanel wingpanel
]; ];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
postPatch = '' postPatch = ''
chmod +x meson/post_install.py chmod +x meson/post_install.py

2
pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
View File

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
wingpanel wingpanel
]; ];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Session Indicator for Wingpanel"; description = "Session Indicator for Wingpanel";

2
pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
View File

@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
wingpanel wingpanel
]; ];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
postPatch = '' postPatch = ''
chmod +x meson/post_install.py chmod +x meson/post_install.py

2
pkgs/desktops/pantheon/services/contractor/default.nix
View File

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
libgee libgee
]; ];
PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder ''out''}/share/dbus-1/services"; PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A desktop-wide extension service used by elementary OS"; description = "A desktop-wide extension service used by elementary OS";

2
pkgs/desktops/surf-display/default.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
--prefix PATH ':' ${stdenv.lib.makeBinPath buildInputs} --prefix PATH ':' ${stdenv.lib.makeBinPath buildInputs}
''; '';
makeFlags = [ "PREFIX=${placeholder ''out''}" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Kiosk browser session manager based on the surf browser"; description = "Kiosk browser session manager based on the surf browser";

2
pkgs/desktops/xfce4-14/xfce4-session/default.nix
View File

@ -9,7 +9,7 @@ mkXfceDerivation rec {
buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ]; buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ];
configureFlags = [ "--with-xsession-prefix=${placeholder ''out''}" ]; configureFlags = [ "--with-xsession-prefix=${placeholder "out"}" ];
# See https://github.com/NixOS/nixpkgs/issues/36468 # See https://github.com/NixOS/nixpkgs/issues/36468
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

2
pkgs/development/libraries/accountsservice/default.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dadmin_group=wheel" "-Dadmin_group=wheel"
"-Dlocalstatedir=/var" "-Dlocalstatedir=/var"
"-Dsystemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
]; ];
postPatch = '' postPatch = ''

4
pkgs/development/libraries/bamf/default.nix
View File

@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
# fix paths # fix paths
makeFlags = [ makeFlags = [
"INTROSPECTION_GIRDIR=${placeholder ''dev''}/share/gir-1.0/" "INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/"
"INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
]; ];
preConfigure = '' preConfigure = ''

2
pkgs/development/libraries/dee/default.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--disable-gtk-doc" "--disable-gtk-doc"
"--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/development/libraries/gnome-menus/default.nix
View File

@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
}; };
makeFlags = [ makeFlags = [
"INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/" "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0/"
"INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
]; ];
nativeBuildInputs = [ pkgconfig gettext ]; nativeBuildInputs = [ pkgconfig gettext ];

4
pkgs/development/libraries/graphene/default.nix
View File

@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dgtk_doc=true" "-Dgtk_doc=true"
"-Dinstalled_test_datadir=${placeholder ''installedTests''}/share" "-Dinstalled_test_datadir=${placeholder "installedTests"}/share"
"-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec" "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec"
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/libraries/libaccounts-glib/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
# See: https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/22 # See: https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/22
patches = [ ./py-override.patch ]; patches = [ ./py-override.patch ];
nativeBuildInputs = [ nativeBuildInputs = [
check check
docbook_xml_dtd_43 docbook_xml_dtd_43
docbook_xsl docbook_xsl
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
mesonFlags = [ mesonFlags = [
"-Dpy-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/development/libraries/libdbusmenu/default.nix
View File

@ -49,9 +49,9 @@ stdenv.mkDerivation rec {
doCheck = false; # generates shebangs in check phase, too lazy to fix doCheck = false; # generates shebangs in check phase, too lazy to fix
installFlags = [ installFlags = [
"sysconfdir=${placeholder ''out''}/etc" "sysconfdir=${placeholder "out"}/etc"
"localstatedir=\${TMPDIR}" "localstatedir=\${TMPDIR}"
"typelibdir=${placeholder ''out''}/lib/girepository-1.0" "typelibdir=${placeholder "out"}/lib/girepository-1.0"
]; ];
meta = { meta = {

4
pkgs/development/libraries/libgdata/default.nix
View File

@ -77,8 +77,8 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dgtk_doc=false" "-Dgtk_doc=false"
"-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec" "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec"
"-Dinstalled_test_datadir=${placeholder ''installedTests''}/share" "-Dinstalled_test_datadir=${placeholder "installedTests"}/share"
"-Dinstalled_tests=true" "-Dinstalled_tests=true"
]; ];

2
pkgs/development/libraries/libgpiod/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--enable-tools=${if enable-tools then "yes" else "no"}" "--enable-tools=${if enable-tools then "yes" else "no"}"
"--enable-bindings-cxx" "--enable-bindings-cxx"
"--prefix=${placeholder ''out''}" "--prefix=${placeholder "out"}"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/development/libraries/libirecovery/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
# as only the `idevicerestore` binary was tested so far (which worked # as only the `idevicerestore` binary was tested so far (which worked
# without further configuration). # without further configuration).
configureFlags = [ configureFlags = [
"--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d" "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""'' ''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""''
]; ];

2
pkgs/development/libraries/libmbim/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
configureFlags = [ configureFlags = [
"--with-udev-base-dir=${placeholder ''out''}/lib/udev" "--with-udev-base-dir=${placeholder "out"}/lib/udev"
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

2
pkgs/development/libraries/libqmi/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
configureFlags = [ configureFlags = [
"--with-udev-base-dir=${placeholder ''out''}/lib/udev" "--with-udev-base-dir=${placeholder "out"}/lib/udev"
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

2
pkgs/development/libraries/libunity/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--disable-static" "--disable-static"
"--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/development/libraries/tracker/default.nix
View File

@ -30,8 +30,8 @@ in stdenv.mkDerivation rec {
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
mesonFlags = [ mesonFlags = [
"-Ddbus_services=${placeholder ''out''}/share/dbus-1/services" "-Ddbus_services=${placeholder "out"}/share/dbus-1/services"
"-Dsystemd_user_services=${placeholder ''out''}/lib/systemd/user" "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user"
# TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
"-Dfunctional_tests=false" "-Dfunctional_tests=false"
"-Ddocs=true" "-Ddocs=true"

2
pkgs/development/libraries/zeitgeist/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
preConfigure = "NOCONFIGURE=1 ./autogen.sh"; preConfigure = "NOCONFIGURE=1 ./autogen.sh";
configureFlags = [ "--with-session-bus-services-dir=${placeholder ''out''}/share/dbus-1/services" ]; configureFlags = [ "--with-session-bus-services-dir=${placeholder "out"}/share/dbus-1/services" ];
nativeBuildInputs = [ nativeBuildInputs = [
autoconf automake libtool pkgconfig gettext gobject-introspection vala python2Packages.python autoconf automake libtool pkgconfig gettext gobject-introspection vala python2Packages.python

6
pkgs/os-specific/linux/upower/default.nix
View File

@ -43,9 +43,9 @@ stdenv.mkDerivation rec {
"--localstatedir=/var" "--localstatedir=/var"
] ]
++ stdenv.lib.optional useSystemd [ ++ stdenv.lib.optional useSystemd [
"--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"--with-systemdutildir=${placeholder ''out''}/lib/systemd" "--with-systemdutildir=${placeholder "out"}/lib/systemd"
"--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d" "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
] ]
; ;

2
pkgs/tools/audio/mp3cat/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
makeFlags = [ makeFlags = [
"PREFIX=${placeholder ''out''}" "PREFIX=${placeholder "out"}"
]; ];
installTargets = [ installTargets = [

2
pkgs/tools/misc/most/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
makeFlags = [ makeFlags = [
"DOC_DIR=${placeholder ''doc''}/share/doc/most" "DOC_DIR=${placeholder "doc"}/share/doc/most"
]; ];
preConfigure = '' preConfigure = ''

6
pkgs/tools/networking/modem-manager/default.nix
View File

@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-polkit" "--with-polkit"
"--with-udev-base-dir=${placeholder ''out''}/lib/udev" "--with-udev-base-dir=${placeholder "out"}/lib/udev"
"--with-dbus-sys-dir=${placeholder ''out''}/etc/dbus-1/system.d" "--with-dbus-sys-dir=${placeholder "out"}/etc/dbus-1/system.d"
"--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--with-systemd-suspend-resume" "--with-systemd-suspend-resume"

4
pkgs/tools/networking/ofono/default.nix
View File

@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
]; ];
configureFlags = [ configureFlags = [
"--with-dbusconfdir=${placeholder ''out''}/share" "--with-dbusconfdir=${placeholder "out"}/share"
"--with-systemdunitdir=${placeholder ''out''}/lib/systemd/system" "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system"
"--enable-external-ell" "--enable-external-ell"
]; ];

2
pkgs/tools/security/sequoia/default.nix
View File

@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
; ;
makeFlags = [ makeFlags = [
"PREFIX=${placeholder ''out''}" "PREFIX=${placeholder "out"}"
]; ];
buildFlags = [ buildFlags = [