diff options
Diffstat (limited to 'pkgs/development')
15 files changed, 22 insertions, 22 deletions
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 8713663ecca..860ac3fde41 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dadmin_group=wheel" "-Dlocalstatedir=/var" - "-Dsystemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" + "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" ]; postPatch = '' diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index de436864eda..b1fb17b08fa 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { # fix paths makeFlags = [ - "INTROSPECTION_GIRDIR=${placeholder ''dev''}/share/gir-1.0/" - "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" + "INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; preConfigure = '' diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index 04ecadadefa..093cc2bdf05 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--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; { diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index 501fe4d0849..f6ff3a2ea4a 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { }; 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" ]; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index c439e763e73..0348135c7b2 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" - "-Dinstalled_test_datadir=${placeholder ''installedTests''}/share" - "-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec" + "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" + "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 7f9dbf3a21f..07e0a3500a7 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # See: https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/22 patches = [ ./py-override.patch ]; - nativeBuildInputs = [ + nativeBuildInputs = [ check docbook_xml_dtd_43 docbook_xsl @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; mesonFlags = [ - "-Dpy-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" + "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index e064084f695..a7bfe7f17a2 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { doCheck = false; # generates shebangs in check phase, too lazy to fix installFlags = [ - "sysconfdir=${placeholder ''out''}/etc" + "sysconfdir=${placeholder "out"}/etc" "localstatedir=\${TMPDIR}" - "typelibdir=${placeholder ''out''}/lib/girepository-1.0" + "typelibdir=${placeholder "out"}/lib/girepository-1.0" ]; meta = { diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index f61283aec4a..14fc7e64a0b 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -77,8 +77,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=false" - "-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec" - "-Dinstalled_test_datadir=${placeholder ''installedTests''}/share" + "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" + "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" "-Dinstalled_tests=true" ]; diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 23f46ad2a0c..782c0a8857a 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tools=${if enable-tools then "yes" else "no"}" "--enable-bindings-cxx" - "--prefix=${placeholder ''out''}" + "--prefix=${placeholder "out"}" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index 32a2971b3e3..be05f120e13 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # as only the `idevicerestore` binary was tested so far (which worked # without further configuration). 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\""'' ]; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 406b88ea8c1..7a7bd115328 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; configureFlags = [ - "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + "--with-udev-base-dir=${placeholder "out"}/lib/udev" ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 8a239048390..930eafc9675 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; configureFlags = [ - "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + "--with-udev-base-dir=${placeholder "out"}/lib/udev" ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index a0ec3b74cc1..501bf9a3dc9 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--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; { diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 397184f798a..db4f620a740 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -30,8 +30,8 @@ in stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; mesonFlags = [ - "-Ddbus_services=${placeholder ''out''}/share/dbus-1/services" - "-Dsystemd_user_services=${placeholder ''out''}/lib/systemd/user" + "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" + "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user" # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas "-Dfunctional_tests=false" "-Ddocs=true" diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index c5dc775d075..9e3b06453bf 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { 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 = [ autoconf automake libtool pkgconfig gettext gobject-introspection vala python2Packages.python |