mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-16 18:37:04 +03:00
rx: 0.2.0 -> 0.3.0
- Remove "--features" invocations - Refactor some meta attributes
This commit is contained in:
parent
c94e211a47
commit
98224979fb
@ -3,25 +3,20 @@
|
|||||||
, xorg ? null
|
, xorg ? null
|
||||||
, vulkan-loader ? null }:
|
, vulkan-loader ? null }:
|
||||||
|
|
||||||
assert stdenv.isLinux -> xorg != null;
|
with stdenv.lib;
|
||||||
assert stdenv.isLinux -> vulkan-loader != null;
|
|
||||||
|
|
||||||
let
|
rustPlatform.buildRustPackage rec {
|
||||||
graphicsBackend = if stdenv.isDarwin then "metal" else "vulkan";
|
|
||||||
in
|
|
||||||
with stdenv.lib;
|
|
||||||
rustPlatform.buildRustPackage rec {
|
|
||||||
pname = "rx";
|
pname = "rx";
|
||||||
version = "0.2.0";
|
version = "0.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cloudhead";
|
owner = "cloudhead";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0f6cw8zqr45bprj8ibhp89bb2a077g4zinfrdn943csdmh47qzcl";
|
sha256 = "0mhpq9x54d884ydmfv1358sgc4jc7bghfx2y0k7p879hyyxr52v1";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "05bqsw0nw24xysq86qa3hx9b5ncf50wfxsgpy388yrs2dfnphwlx";
|
cargoSha256 = "0fnrgijfkvapj1yyy9grnqh2vkciisf029af0gfwyzsxzdi62gg5";
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
|
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
|
||||||
|
|
||||||
@ -31,15 +26,8 @@ in
|
|||||||
libX11 libXrandr libXinerama libXcursor libXi libXext
|
libX11 libXrandr libXinerama libXcursor libXi libXext
|
||||||
]);
|
]);
|
||||||
|
|
||||||
cargoBuildFlags = [ "--features=${graphicsBackend}" ];
|
# FIXME: GLFW (X11) requires DISPLAY env variable for all tests
|
||||||
|
doCheck = false;
|
||||||
# TODO: better to factor that into the rust platform
|
|
||||||
checkPhase = ''
|
|
||||||
runHook preCheck
|
|
||||||
echo "Running cargo test"
|
|
||||||
cargo test --features=${graphicsBackend}
|
|
||||||
runHook postCheck
|
|
||||||
'';
|
|
||||||
|
|
||||||
postInstall = optional stdenv.isLinux ''
|
postInstall = optional stdenv.isLinux ''
|
||||||
mkdir -p $out/share/applications
|
mkdir -p $out/share/applications
|
||||||
@ -52,7 +40,6 @@ in
|
|||||||
homepage = "https://cloudhead.io/rx/";
|
homepage = "https://cloudhead.io/rx/";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
maintainers = with maintainers; [ minijackson ];
|
maintainers = with maintainers; [ minijackson ];
|
||||||
platforms = with platforms; (linux ++ darwin ++ windows);
|
platforms = platforms.all;
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user