diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-12 15:36:41 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-13 11:16:10 -0400 |
| commit | 5aec3f96a26806dc26759bc2f13b062caaad3c17 (patch) | |
| tree | a25ad6b59b59dfa7686c04398ed2527c3a16a7b6 /pkgs/test | |
| parent | 741839a687b5ecad445dbb7afb87ceeacdde2d6b (diff) | |
| download | nixpkgs-5aec3f96a26806dc26759bc2f13b062caaad3c17.tar nixpkgs-5aec3f96a26806dc26759bc2f13b062caaad3c17.tar.gz nixpkgs-5aec3f96a26806dc26759bc2f13b062caaad3c17.tar.bz2 nixpkgs-5aec3f96a26806dc26759bc2f13b062caaad3c17.tar.lz nixpkgs-5aec3f96a26806dc26759bc2f13b062caaad3c17.tar.xz nixpkgs-5aec3f96a26806dc26759bc2f13b062caaad3c17.tar.zst nixpkgs-5aec3f96a26806dc26759bc2f13b062caaad3c17.zip | |
treewide: Use `*Platform.extensions`
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/cc-wrapper/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/test/stdenv-inputs/default.nix | 12 |
2 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index d8a5e135581..41a7685ed2e 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -1,9 +1,5 @@ { stdenv }: -let - shlib = if stdenv.isDarwin then "dylib" else "so"; -in - stdenv.mkDerivation { name = "cc-wrapper-test"; @@ -34,7 +30,12 @@ stdenv.mkDerivation { printf "checking whether compiler uses NIX_LDFLAGS... " >&2 mkdir -p foo/lib - $CC -shared ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} -DVALUE=42 -o foo/lib/libfoo.${shlib} ${./foo.c} + $CC -shared \ + ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ + -DVALUE=42 \ + -o foo/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ + ${./foo.c} + NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c} ./ldflags-check diff --git a/pkgs/test/stdenv-inputs/default.nix b/pkgs/test/stdenv-inputs/default.nix index d1eb8b9bfe2..13fa985839d 100644 --- a/pkgs/test/stdenv-inputs/default.nix +++ b/pkgs/test/stdenv-inputs/default.nix @@ -1,8 +1,6 @@ { stdenv }: let - shlib = if stdenv.isDarwin then "dylib" else "so"; - foo = stdenv.mkDerivation { name = "foo-test"; @@ -13,7 +11,10 @@ let $CC -o $out/bin/foo ${./cc-main.c} chmod +x $out/bin/foo cp ${./foo.c} $out/include/foo.h - $CC -shared ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} -o $out/lib/libfoo.${shlib} ${./foo.c} + $CC -shared \ + ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} \ + -o $out/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ + ${./foo.c} ''; }; @@ -28,7 +29,10 @@ let $CC -o $out/bin/bar ${./cc-main.c} chmod +x $out/bin/bar cp ${./bar.c} $dev/include/bar.h - $CC -shared ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} -o $dev/lib/libbar.${shlib} ${./bar.c} + $CC -shared \ + ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} \ + -o $dev/lib/libbar${stdenv.hostPlatform.extensions.sharedLibrary} \ + ${./bar.c} ''; }; in |