diff options
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/gmic/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/colord/default.nix | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index c267695dd784..51212a3ea946 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -32,16 +32,12 @@ in stdenv.mkDerivation rec { "-DBUILD_LIB_STATIC=OFF" "-DBUILD_PLUGIN=${if withGimpPlugin then "ON" else "OFF"}" "-DENABLE_DYNAMIC_LINKING=ON" - ]; + ] ++ stdenv.lib.optional withGimpPlugin "-DPLUGIN_INSTALL_PREFIX=${placeholder "gimpPlugin"}/${gimp.targetPluginDir}"; postPatch = '' cp ${CMakeLists} CMakeLists.txt ''; - preConfigure = stdenv.lib.optionalString withGimpPlugin '' - cmakeFlags="$cmakeFlags -DPLUGIN_INSTALL_PREFIX=$gimpPlugin/${gimp.targetPluginDir}" - ''; - meta = with stdenv.lib; { description = "G'MIC is an open and full-featured framework for image processing"; homepage = http://gmic.eu/; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index a5d71a9487cc..e442850fbaaf 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { glib-compile-schemas $out/share/glib-2.0/schemas ''; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "lib/systemd/system"; - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user"; - PKG_CONFIG_SYSTEMD_TMPFILESDIR = "lib/tmpfiles.d"; - PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "share/bash-completion/completions"; - PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d"; + PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions"; + PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; postFixup = '' wrapProgram "$out/libexec/colord-session" \ |