Commit b81e9cfd authored by ccicnce113424's avatar ccicnce113424
Browse files

kmscon: fix systemd unit path and runtime dependency

parent b72f8ddb
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@
  ninja,
  check,
  bash,
  gawk,
  inotify-tools,
  buildPackages,
  nix-update-script,
  nixosTests,
@@ -78,6 +80,13 @@ stdenv.mkDerivation (finalAttrs: {
    done
  '';

  postFixup = ''
    substituteInPlace $out/bin/kmscon \
      --replace-fail "awk" "${lib.getExe gawk}"
    substituteInPlace $out/bin/kmscon-launch-gui \
      --replace-fail "inotifywait" "${lib.getExe' inotify-tools "inotifywait"}"
  '';

  passthru = {
    tests.kmscon = nixosTests.kmscon;
    updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ index de29a32..e731bbd 100644
 
 systemd_deps = dependency('systemd', required: false)
-systemdsystemunitdir = systemd_deps.get_variable('systemdsystemunitdir', default_value: 'lib/systemd/system')
+systemdsystemunitdir = get_option('libdir') / 'systemd'
+systemdsystemunitdir = get_option('libdir') / 'systemd' / 'system'
 
 #
 # Required dependencies