diff options
author | John Ericson <Ericson2314@yahoo.com> | 2017-07-11 14:33:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-11 14:33:23 -0400 |
commit | a889454869e4f7d5ba6067ebcc0ba7fcd26e4417 (patch) | |
tree | f7d99418d0c1c5026b75d0922e33c2418e6df9b1 /pkgs/development | |
parent | 43ff1c82627a9d77988260e08a86d5e8dbccc4b7 (diff) | |
parent | 3cb745d5a69018829ac15f7d5a508135f6bda123 (diff) | |
download | nixpkgs-a889454869e4f7d5ba6067ebcc0ba7fcd26e4417.tar nixpkgs-a889454869e4f7d5ba6067ebcc0ba7fcd26e4417.tar.gz nixpkgs-a889454869e4f7d5ba6067ebcc0ba7fcd26e4417.tar.bz2 nixpkgs-a889454869e4f7d5ba6067ebcc0ba7fcd26e4417.tar.lz nixpkgs-a889454869e4f7d5ba6067ebcc0ba7fcd26e4417.tar.xz nixpkgs-a889454869e4f7d5ba6067ebcc0ba7fcd26e4417.tar.zst nixpkgs-a889454869e4f7d5ba6067ebcc0ba7fcd26e4417.zip |
Merge pull request #27284 from obsidiansystems/prop-lines
stdenv: Store one package per line in nix-support/propagated-*
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/openjdk-darwin/8.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/openjdk-darwin/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/openjdk/7.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/zulu/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix index 51effd2c784..691829c7788 100644 --- a/pkgs/development/compilers/openjdk-darwin/8.nix +++ b/pkgs/development/compilers/openjdk-darwin/8.nix @@ -33,7 +33,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix index 10a9eb2b366..8ce0835fcb6 100644 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ b/pkgs/development/compilers/openjdk-darwin/default.nix @@ -23,7 +23,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix index 6dcbb0a330f..9ef7d26b2ef 100644 --- a/pkgs/development/compilers/openjdk/7.nix +++ b/pkgs/development/compilers/openjdk/7.nix @@ -190,7 +190,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $jre/nix-support - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. mkdir -p $out/nix-support diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 7ddf2c7ef5d..da1332127eb 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -202,7 +202,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $jre/nix-support - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. mkdir -p $out/nix-support diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 8fe775de146..196544a6476 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -157,7 +157,7 @@ let result = stdenv.mkDerivation rec { ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. cat <<EOF >> $out/nix-support/setup-hook diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 7621aa82bc7..021e94761f8 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. cat <<EOF >> $out/nix-support/setup-hook diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 97a3adaf220..e097fd5af33 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -311,7 +311,7 @@ stdenv.mkDerivation ({ ${optionalString isGhcjs '' for exeDir in "$out/bin/"*.jsexe; do exe="''${exeDir%.jsexe}" - printf '%s\n' '#!${nodejs}/bin/node' > "$exe" + printLines '#!${nodejs}/bin/node' > "$exe" cat "$exeDir/all.js" >> "$exe" chmod +x "$exe" done |