diff options
Diffstat (limited to 'nixos/modules')
4 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 0fe8d1a89cf3..b4b5a6fdc07e 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -43,7 +43,7 @@ let # Paths to external programs. $wgDiff3 = "${pkgs.diffutils}/bin/diff3"; $wgDiff = "${pkgs.diffutils}/bin/diff"; - $wgImageMagickConvertCommand = "${pkgs.imagemagick}/bin/convert"; + $wgImageMagickConvertCommand = "${pkgs.imagemagick.out}/bin/convert"; #$wgDebugLogFile = "/tmp/mediawiki_debug_log.txt"; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 16996b9f96c1..b8d19eb80c85 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -44,7 +44,7 @@ let ${cfg.extraGSettingsOverrides} EOF - ${pkgs.glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/ + ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/ ''; }; diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index 2981e7545e81..e74b19c8e710 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -169,10 +169,10 @@ in { config = mkIf cfg.enable { - services.xserver.modules = [ pkg ]; + services.xserver.modules = [ pkg.out ]; environment.etc."${etcFile}".source = - "${pkg}/share/X11/xorg.conf.d/50-synaptics.conf"; + "${pkg.out}/share/X11/xorg.conf.d/50-synaptics.conf"; environment.systemPackages = [ pkg ]; diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 400293d0e2e9..8dad09c89207 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -438,7 +438,7 @@ in copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl - cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto + cc -O3 -I${pkgs.openssl.dev}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto strip -s pbkdf2-sha512 copy_bin_and_libs pbkdf2-sha512 |