diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-09-13 11:20:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 11:20:06 -0400 |
| commit | 8fccaa284d8e51eac2a97a6ca3a3c28d78592008 (patch) | |
| tree | 825f6ba8235e92abf899c070569b179ed6c9b122 /pkgs/applications | |
| parent | 98d84b1375971627d3e5eac9065c4b1dc304b009 (diff) | |
| parent | 5aec3f96a26806dc26759bc2f13b062caaad3c17 (diff) | |
| download | nixpkgs-8fccaa284d8e51eac2a97a6ca3a3c28d78592008.tar nixpkgs-8fccaa284d8e51eac2a97a6ca3a3c28d78592008.tar.gz nixpkgs-8fccaa284d8e51eac2a97a6ca3a3c28d78592008.tar.bz2 nixpkgs-8fccaa284d8e51eac2a97a6ca3a3c28d78592008.tar.lz nixpkgs-8fccaa284d8e51eac2a97a6ca3a3c28d78592008.tar.xz nixpkgs-8fccaa284d8e51eac2a97a6ca3a3c28d78592008.tar.zst nixpkgs-8fccaa284d8e51eac2a97a6ca3a3c28d78592008.zip | |
Merge pull request #29282 from obsidiansystems/soext
lib, treewide: Add `*Platform.extensions` and use it where possible
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/cluster/mesos/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 16ef657111f..0506f7c154d 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -8,7 +8,6 @@ let mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; }; - soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; # `tar -z` requires gzip on $PATH, so wrap tar. # At some point, we should try to patch mesos so we add gzip to the PATH when # tar is invoked. I think that only needs to be done here: @@ -193,7 +192,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/java cp src/java/target/mesos-*.jar $out/share/java - MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos.${soext} + MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary} mkdir -p $out/nix-support touch $out/nix-support/setup-hook |