diff options
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/crystal/build-package.nix | 10 | ||||
-rw-r--r-- | pkgs/development/compilers/osl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ponyc/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/stalin/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/swift/default.nix | 2 |
6 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index 1d8b0137eb0ca..67c8128f6b5d7 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (mkDerivationArgs // { buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([ "runHook preBuild" ] ++ lib.optional (format == "make") - ''make ''${buildTargets:-build} $makeFlags'' + "make \${buildTargets:-build} $makeFlags" ++ lib.optionals (format == "crystal") (lib.mapAttrsToList (bin: attrs: '' crystal ${lib.escapeShellArgs ([ @@ -84,14 +84,14 @@ stdenv.mkDerivation (mkDerivationArgs // { installPhase = args.installPhase or (lib.concatStringsSep "\n" ([ "runHook preInstall" ] ++ lib.optional (format == "make") - ''make ''${installTargets:-install} $installFlags'' + "make \${installTargets:-install} $installFlags" ++ lib.optionals (format == "crystal") (map (bin: '' install -Dm555 ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} '') (lib.attrNames crystalBinaries)) ++ lib.optional (format == "shards") - ''install -Dm555 bin/* -t $out/bin'' + "install -Dm555 bin/* -t $out/bin" ++ [ '' for f in README* *.md LICENSE; do @@ -111,9 +111,9 @@ stdenv.mkDerivation (mkDerivationArgs // { checkPhase = args.checkPhase or (lib.concatStringsSep "\n" ([ "runHook preCheck" ] ++ lib.optional (format == "make") - ''make ''${checkTarget:-test} $checkFlags'' + "make \${checkTarget:-test} $checkFlags" ++ lib.optional (format != "make") - ''crystal ''${checkTarget:-spec} $checkFlags'' + "crystal \${checkTarget:-spec} $checkFlags" ++ [ "runHook postCheck" ])); doInstallCheck = args.doInstallCheck or true; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index a4111f7199882..d3de5cad2f694 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -19,7 +19,7 @@ in clangStdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; - preConfigure = '' patchShebangs src/liboslexec/serialize-bc.bash ''; + preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash "; nativeBuildInputs = [ cmake boost_static flex bison]; buildInputs = [ diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index e34ed4b157dbf..3a2e3c4b944c9 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -87,10 +87,9 @@ stdenv.mkDerivation (rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; - installPhase = '' - make config=release prefix=$out '' - + lib.optionalString stdenv.isDarwin '' bits=64 '' - + lib.optionalString (stdenv.isDarwin && (!lto)) '' lto=no '' + installPhase = "make config=release prefix=$out " + + lib.optionalString stdenv.isDarwin "bits=64 " + + lib.optionalString (stdenv.isDarwin && (!lto)) "lto=no " + '' install wrapProgram $out/bin/ponyc \ diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index e27c190acd784..315fe7c0c6d1c 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -117,7 +117,7 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs src/etc - ${optionalString (!withBundledLLVM) ''rm -rf src/llvm''} + ${optionalString (!withBundledLLVM) "rm -rf src/llvm"} # Fix the configure script to not require curl as we won't use it sed -i configure \ diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix index 40ab4abf88553..f47086b1ca257 100644 --- a/pkgs/development/compilers/stalin/default.nix +++ b/pkgs/development/compilers/stalin/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncompress libX11 ]; - buildPhase = '' ./build ''; + buildPhase = "./build "; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index bf181d07f28f5..26e9f2b87e1aa 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -321,7 +321,7 @@ stdenv.mkDerivation { ''; # Hack to avoid build and install directories in RPATHs. - preFixup = ''rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR''; + preFixup = "rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR"; meta = with lib; { description = "The Swift Programming Language"; |