mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-30 08:44:31 +00:00
slade: 3.2.4 -> 3.2.5
Remove the old `postPatch` for non-x86 systems as upstream implemented a check. Add fix for PK3 destination.
This commit is contained in:
parent
4cf470c97c
commit
6ab5992b6f
@ -19,17 +19,18 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slade";
|
||||
version = "3.2.4";
|
||||
version = "3.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sirjuddington";
|
||||
repo = "SLADE";
|
||||
rev = version;
|
||||
sha256 = "sha256-CN01w+sXXRqvQqu1whePAb+phVx+VM8tL2NusfnCyF8=";
|
||||
sha256 = "sha256-FBpf1YApwVpWSpUfa2LOrkS1Ef34sKCIZ6ic+Pczs14=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''
|
||||
sed -i '/-msse/d' src/CMakeLists.txt
|
||||
postPatch = ''
|
||||
substituteInPlace dist/CMakeLists.txt \
|
||||
--replace "PK3_OUTPUT" "PK3_DESTINATION"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -54,6 +55,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [
|
||||
"-DwxWidgets_LIBRARIES=${wxGTK}/lib"
|
||||
"-DBUILD_PK3=ON"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";
|
||||
|
Loading…
Reference in New Issue
Block a user