Unverified Commit c0d1de14 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #179291 from dotlambda/utillinux-alias 

treewide: don't use utillinux alias
parents e953e73b 40990c35

nixos/lib/make-multi-disk-zfs-image.nix

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ let 
      gptfdisk

      nix

      parted

      utillinux

      util-linux

      zfs

    ]

  );

nixos/lib/make-single-disk-zfs-image.nix

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ let 
      gptfdisk

      nix

      parted

      utillinux

      util-linux

      zfs

    ]

  );

pkgs/applications/backup/timeshift/unwrapped.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
, gtk3

, json-glib

, libgee

, utillinux

, util-linux

, vte

, xapps

}:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec { 
  postPatch = ''

    while IFS="" read -r -d $'\0' FILE; do

      substituteInPlace "$FILE" \

        --replace "/sbin/blkid" "${utillinux}/bin/blkid"

        --replace "/sbin/blkid" "${util-linux}/bin/blkid"

    done < <(find ./src -mindepth 1 -name "*.vala" -type f -print0)

    substituteInPlace ./src/Utility/IconManager.vala \

      --replace "/usr/share" "$out/share"