Unverified Commit 6d1d15bb authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

pkgs: remove optional builtins prefixes from prelude functions (#447404)

parents 1e668416 8052c761

pkgs/applications/audio/mellowplayer/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ mkDerivation rec { 
  # TODO: The tests are failing because it can't locate QT plugins. Is there a better way to do this?

  + (builtins.concatStringsSep "\n" (

    lib.lists.flatten (

      builtins.map (pkg: [

      map (pkg: [

        (lib.optionalString (pkg ? qtPluginPrefix) ''

          export QT_PLUGIN_PATH="${pkg}/${pkg.qtPluginPrefix}"''${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH

        '')

pkgs/applications/audio/pianoteq/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ let 
      installPhase = ''

        runHook preInstall

        mkdir -p $out/bin

        mv -t $out/bin ${builtins.concatStringsSep " " (builtins.map (dir: "Pianoteq*/${dir}/*") archdirs)}

        mv -t $out/bin ${builtins.concatStringsSep " " (map (dir: "Pianoteq*/${dir}/*") archdirs)}

        install -Dm644 ${./pianoteq.svg} $out/share/icons/hicolor/scalable/apps/pianoteq.svg

        for size in 16 22 32 48 64 128 256; do

          dir=$out/share/icons/hicolor/"$size"x"$size"/apps

pkgs/applications/audio/sonic-pi/update.sh

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ vendorhash() { 


findpath() {

    path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"

    outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"

    outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "fetchGit \"$nixpkgs\"")"



    if [ -n "$outpath" ]; then

        path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"

pkgs/applications/blockchains/bitcoin-knots/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { 
            echo "OK"

          '';

        in

        builtins.concatStringsSep "\n" (builtins.map script builderKeys);

        builtins.concatStringsSep "\n" (map script builderKeys);

    in

    ''

      pushd $(mktemp -d)

pkgs/applications/blockchains/bitcoin/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { 
            echo "OK"

          '';

        in

        builtins.concatStringsSep "\n" (builtins.map script builderKeys);

        builtins.concatStringsSep "\n" (map script builderKeys);

    in

    ''

      pushd $(mktemp -d)