commit 019ad49a9b79b9ce1f84d64c0076183c65246398 · pyrox.dev/nixpkgs

+41 -14

pkgs/by-name/sc/scopehal-apps/package.nix

···

       13
       13
        
         libsigcxx,

     

       14
       14
        
         glew,

     

       15
       15
        
         zstd,

     

       16
       16
       -
         wrapGAppsHook4,

     

       16
       16
       +
         wrapGAppsHook3,

     

       17
       17
       +
         makeBinaryWrapper,

     

       18
       18
       +
         writeDarwinBundle,

     

       17
       19
        
         shaderc,

     

       18
       20
        
         vulkan-headers,

     

       19
       21
        
         vulkan-loader,

     
···

       23
       25
        
         ffts,

     

       24
       26
        
         moltenvk,

     

       25
       27
        
         llvmPackages,

     

       28
       28
       +
         hidapi,

     

       26
       29
        
       }:

     

       27
       30
        
       

     

       28
       28
       -
       stdenv.mkDerivation {

     

       31
       31
       +
       let

     

       29
       32
        
         pname = "scopehal-apps";

     

       30
       30
       -
         version = "0-unstable-2024-09-16";

     

       33
       33
       +
         version = "0.1";

     

       34
       34
       +
       in

     

       35
       35
       +
       stdenv.mkDerivation {

     

       36
       36
       +
         pname = "${pname}";

     

       37
       37
       +
         version = "${version}";

     

       31
       38
        
       

     

       32
       39
        
         src = fetchFromGitHub {

     

       33
       40
        
           owner = "ngscopeclient";

     

       34
       34
       -
           repo = "scopehal-apps";

     

       35
       35
       -
           rev = "d2a1a2f17e9398a3f60c99483dd2f6dbc2e62efc";

     

       36
       36
       -
           hash = "sha256-FQoaTuL6mEqnH8oNXwHpDcOEAPGExqj6lhrUhZ9VAQ4=";

     

       41
       41
       +
           repo = "${pname}";

     

       42
       42
       +
           tag = "v${version}";

     

       43
       43
       +
           hash = "sha256-AfO6JaWA9ECMI6FkMg/LaAG4QMeZmG9VxHiw0dSJYNM=";

     

       37
       44
        
           fetchSubmodules = true;

     

       38
       45
        
         };

     

       39
       46
        
       

     
···

       46
       53
        
           spirv-tools

     

       47
       54
        
         ]

     

       48
       55
        
         ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       49
       49
       -
           wrapGAppsHook4

     

       56
       56
       +
           wrapGAppsHook3

     

       57
       57
       +
         ]

     

       58
       58
       +
         ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       59
       59
       +
           makeBinaryWrapper

     

       60
       60
       +
           writeDarwinBundle

     

       50
       61
        
         ];

     

       51
       62
        
       

     

       52
       63
        
         buildInputs = [

     
···

       61
       72
        
           vulkan-tools

     

       62
       73
        
           yaml-cpp

     

       63
       74
        
           zstd

     

       75
       75
       +
           hidapi

     

       64
       76
        
         ]

     

       65
       77
        
         ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       66
       78
        
           ffts

     
···

       72
       84
        
           moltenvk

     

       73
       85
        
         ];

     

       74
       86
        
       

     

       75
       75
       -
         # Targets InitializeSearchPaths

     

       76
       76
       -
         postPatch = ''

     

       77
       77
       -
           substituteInPlace lib/scopehal/scopehal.cpp \

     

       78
       78
       -
             --replace-fail '"/share/' '"/../share/'

     

       87
       87
       +
         cmakeFlags = [

     

       88
       88
       +
           "-DNGSCOPECLIENT_VERSION=${version}"

     

       89
       89
       +
         ];

     

       90
       90
       +
       

     

       91
       91
       +
         patches = [

     

       92
       92
       +
           ./remove-git-derived-version.patch

     

       93
       93
       +
         ]

     

       94
       94
       +
         ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       95
       95
       +
           ./remove-brew-molten-vk-lookup.patch

     

       96
       96
       +
         ];

     

       97
       97
       +
       

     

       98
       98
       +
         postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       99
       99
       +
           mv -v $out/bin/ngscopeclient $out/bin/.ngscopeclient-unwrapped

     

       100
       100
       +
           makeWrapper $out/bin/.ngscopeclient-unwrapped $out/bin/ngscopeclient \

     

       101
       101
       +
             --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath ([ vulkan-loader ])}"

     

       79
       102
        
         '';

     

       80
       103
        
       

     

       81
       81
       -
         cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [

     

       82
       82
       -
           "-DCMAKE_INSTALL_RPATH=${lib.strings.makeLibraryPath [ vulkan-loader ]}"

     

       83
       83
       -
         ];

     

       104
       104
       +
         postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       105
       105
       +
           mkdir -p $out/Applications/ngscopeclient.app/Contents/{MacOS,Resources}

     

       106
       106
       +
       

     

       107
       107
       +
           install -m644 {../src/ngscopeclient/icons/macos,$out/Applications/ngscopeclient.app/Contents/Resources}/ngscopeclient.icns

     

       108
       108
       +
       

     

       109
       109
       +
           write-darwin-bundle $out ngscopeclient ngscopeclient ngscopeclient

     

       110
       110
       +
         '';

     

       84
       111
        
       

     

       85
       112
        
         meta = {

     

       86
       113
        
           description = "Advanced test & measurement remote control and analysis suite";

+36

pkgs/by-name/sc/scopehal-apps/remove-brew-molten-vk-lookup.patch

···

       1
       1
       +
       diff --git a/src/ngscopeclient/CMakeLists.txt b/src/ngscopeclient/CMakeLists.txt

     

       2
       2
       +
       index fb6d19fa..25611981 100644

     

       3
       3
       +
       --- a/src/ngscopeclient/CMakeLists.txt

     

       4
       4
       +
       +++ b/src/ngscopeclient/CMakeLists.txt

     

       5
       5
       +
       @@ -249,31 +249,6 @@ if(LINUX)

     

       6
       6
       +
        		DESTINATION share/mime/packages)

     

       7
       7
       +
        endif()

     

       8
       8
       +
        

     

       9
       9
       +
       -if(APPLE)

     

       10
       10
       +
       -	set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/ngscopeclient")

     

       11
       11
       +
       -	set(DIRS "\${CMAKE_INSTALL_PREFIX}/lib")

     

       12
       12
       +
       -	set(FRAMEWORKS "\${CMAKE_INSTALL_PREFIX}/Frameworks")

     

       13
       13
       +
       -	execute_process(

     

       14
       14
       +
       -		COMMAND brew --prefix molten-vk

     

       15
       15
       +
       -		RESULT_VARIABLE MOLTEN_VK_RESULT

     

       16
       16
       +
       -		OUTPUT_VARIABLE MOLTEN_VK_OUTPUT

     

       17
       17
       +
       -		ERROR_QUIET

     

       18
       18
       +
       -		OUTPUT_STRIP_TRAILING_WHITESPACE

     

       19
       19
       +
       -	)

     

       20
       20
       +
       -	if(NOT MOLTEN_VK_RESULT EQUAL 0)

     

       21
       21
       +
       -		message(FATAL_ERROR "failed to find Homebrew prefix for molten-vk")

     

       22
       22
       +
       -	endif()

     

       23
       23
       +
       -	# https://vulkan.lunarg.com/doc/view/1.3.275.0/mac/getting_started.html#application-bundle-structure-on-macos

     

       24
       24
       +
       -	install(FILES "${CMAKE_SOURCE_DIR}/src/ngscopeclient/macos/MoltenVK_icd.json"

     

       25
       25
       +
       -		DESTINATION bin/vulkan/icd.d/)

     

       26
       26
       +
       -	install(FILES "${MOLTEN_VK_OUTPUT}/lib/libMoltenVK.dylib" DESTINATION lib)

     

       27
       27
       +
       -	install(CODE "

     

       28
       28
       +
       -		include(BundleUtilities)

     

       29
       29
       +
       -		fixup_bundle(\"${APPS}\" \"lib/libMoltenVK.dylib\" \"${DIRS}\")

     

       30
       30
       +
       -		include(\"${CMAKE_SOURCE_DIR}/src/ngscopeclient/macos/signing.cmake\")

     

       31
       31
       +
       -		")

     

       32
       32
       +
       -endif()

     

       33
       33
       +
       -

     

       34
       34
       +
        # ngscopeclient Windows portable zip/MSI installer build

     

       35
       35
       +
        if(WIXPATH AND WIN32)

     

       36
       36
       +
        	# Run the command to get /mingw64/bin full path using where gcc

+50

pkgs/by-name/sc/scopehal-apps/remove-git-derived-version.patch

···

       1
       1
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       +
       index d362165d..7e3dfd09 100644

     

       3
       3
       +
       --- a/CMakeLists.txt

     

       4
       4
       +
       +++ b/CMakeLists.txt

     

       5
       5
       +
       @@ -23,45 +23,6 @@ if(DEFINED ENV{VULKAN_SDK})

     

       6
       6
       +
        	endif()

     

       7
       7
       +
        endif()

     

       8
       8
       +
        

     

       9
       9
       +
       -# Git is used for git-describe based version generation if we have it

     

       10
       10
       +
       -find_package(Git)

     

       11
       11
       +
       -

     

       12
       12
       +
       -#Set up versioning (with a dummy string for now if Git isn't present)

     

       13
       13
       +
       -if(Git_FOUND)

     

       14
       14
       +
       -	execute_process(

     

       15
       15
       +
       -		COMMAND ${GIT_EXECUTABLE} describe --always --tags

     

       16
       16
       +
       -		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}

     

       17
       17
       +
       -		OUTPUT_VARIABLE NGSCOPECLIENT_VERSION

     

       18
       18
       +
       -		OUTPUT_STRIP_TRAILING_WHITESPACE)

     

       19
       19
       +
       -	message("Git reports scopehal-apps version ${NGSCOPECLIENT_VERSION}")

     

       20
       20
       +
       -

     

       21
       21
       +
       -

     

       22
       22
       +
       -	execute_process(

     

       23
       23
       +
       -		COMMAND ${GIT_EXECUTABLE} describe --always --tags --long

     

       24
       24
       +
       -		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}

     

       25
       25
       +
       -		OUTPUT_VARIABLE NGSCOPECLIENT_VERSION_LONG

     

       26
       26
       +
       -		OUTPUT_STRIP_TRAILING_WHITESPACE)

     

       27
       27
       +
       -

     

       28
       28
       +
       -	# TODO: if/when we have a point release, make MSI version 10x+9

     

       29
       29
       +
       -	# ex: 0.1.2-rc2 is 0.1.22

     

       30
       30
       +
       -	# ex: 0.1.2 is 0.1.29

     

       31
       31
       +
       -

     

       32
       32
       +
       -	# Ugly string parsing to make windows build happy

     

       33
       33
       +
       -	# First path: release candidate tags

     

       34
       34
       +
       -	if(NGSCOPECLIENT_VERSION_LONG MATCHES "v([0-9]*).([0-9]*)-rc([0-9])-([0-9]*)")

     

       35
       35
       +
       -		set(MSI_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}.${CMAKE_MATCH_4}")

     

       36
       36
       +
       -

     

       37
       37
       +
       -	# Release tags

     

       38
       38
       +
       -	elseif(NGSCOPECLIENT_VERSION_LONG MATCHES "v([0-9]*).([0-9]*)-([0-9]*)")

     

       39
       39
       +
       -		set(MSI_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.9.${CMAKE_MATCH_3}")

     

       40
       40
       +
       -	endif()

     

       41
       41
       +
       -

     

       42
       42
       +
       -else()

     

       43
       43
       +
       -	set(NGSCOPECLIENT_VERSION "unknown")

     

       44
       44
       +
       -	set(MSI_VERSION "0.1")

     

       45
       45
       +
       -	message("Git not detected, scopehal-apps version unknown")

     

       46
       46
       +
       -endif()

     

       47
       47
       +
       -

     

       48
       48
       +
        set(PROJECT_VERSION "${NGSCOPECLIENT_VERSION}")

     

       49
       49
       +
        

     

       50
       50
       +
        include(CTest)