diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/glib-networking/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/gvfs/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libfm/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/libwnck/3.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/pipewire/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/science/math/sympow/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/spice-gtk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/umockdev/default.nix | 4 |
8 files changed, 17 insertions, 20 deletions
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index e0bbae69c4ff..3deaf28373dd 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "lib/gio/modules"; + PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "${placeholder "out"}/lib/gio/modules"; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 86cbd01a6026..360c1fb41f4e 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -63,9 +63,9 @@ stdenv.mkDerivation rec { # Uncomment when switching back to meson # mesonFlags = [ - # "-Dgio_module_dir=lib/gio/modules" - # "-Dsystemduserunitdir=lib/systemd/user" - # "-Ddbus_service_dir=share/dbus-1/services" + # "-Dgio_module_dir=${placeholder "out"}/lib/gio/modules" + # "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" + # "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services" # "-Dtmpfilesdir=no" # ] ++ stdenv.lib.optionals (!gnomeSupport) [ # "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false" diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index ce1d3b138f88..796c03dab5ee 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkgconfig, vala_0_34 +{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkgconfig, vala , extraOnly ? false , withGtk3 ? false, gtk2, gtk3 }: let @@ -16,12 +16,11 @@ stdenv.mkDerivation rec { sha256 = "0wkwbi1nyvqza3r1dhrq846axiiq0fy0dqgngnagh76fjrwnzl0q"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk intltool pango vala_0_34 ] - ++ optional (!extraOnly) menu-cache; + nativeBuildInputs = [ vala pkgconfig intltool ]; + buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache; - configureFlags = [ (optional extraOnly "--with-extra-only") - (optional withGtk3 "--with-gtk=3") ]; + configureFlags = optional extraOnly "--with-extra-only" + ++ optional withGtk3 "--with-gtk=3"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 8efd908584e1..f2d05d14d693 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -19,8 +19,8 @@ in stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; propagatedBuildInputs = [ libX11 gtk3 ]; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index c50fc9fb35c8..e87ed8e48a98 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { "-Denable_gstreamer=true" ]; - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index c34701e3f913..f421755b6182 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -34,13 +34,11 @@ stdenv.mkDerivation rec { makeWrapper "$out/share/sympow/sympow" "$out/bin/sympow" \ --run 'export SYMPOW_LOCAL="$HOME/.local/share/sympow"' \ --run 'if [ ! -d "$SYMPOW_LOCAL" ]; then - mkdir -p "$SYMPOW_LOCAL" - cp -r @out@/share/sympow/* "$SYMPOW_LOCAL" + mkdir -p "$SYMPOW_LOCAL" + cp -r ${placeholder "out"}/share/sympow/* "$SYMPOW_LOCAL" chmod -R +xw "$SYMPOW_LOCAL" fi' \ --run 'cd "$SYMPOW_LOCAL"' - substituteInPlace $out/bin/sympow --subst-var out - runHook postInstall ''; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index f4f10978ec13..f5258c1cd6d8 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ]; - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "$(out)/share/polkit-1/actions"; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; configureFlags = [ "--with-gtk3" diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index b89450b810b8..912bcac55cd0 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "umockdev-${version}"; - version = "0.11.3"; + version = "0.12"; outputs = [ "bin" "out" "dev" "doc" ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "martinpitt"; repo = "umockdev"; rev = version; - sha256 = "1z101yw7clxz39im3y435s3rj1gna3kp0fkj9wd62vxqvk68lhik"; + sha256 = "1j7kkxpqs991w3qdlb779gzv38l1vpnlk3laabi2ndk83j1wl5k2"; }; # autoreconfHook complains if we try to build the documentation |