trying to fix lightlyshaders
This commit is contained in:
		
							parent
							
								
									da8de355b1
								
							
						
					
					
						commit
						730787bfe6
					
				
					 5 changed files with 18 additions and 29 deletions
				
			
		| 
						 | 
				
			
			@ -8,6 +8,7 @@
 | 
			
		|||
  # kglobalaccel,
 | 
			
		||||
  # kinit,
 | 
			
		||||
  kwin,
 | 
			
		||||
  kdecoration,
 | 
			
		||||
  # kio,
 | 
			
		||||
  # kguiaddons,
 | 
			
		||||
  # kcoreaddons,
 | 
			
		||||
| 
						 | 
				
			
			@ -43,6 +44,7 @@ stdenv.mkDerivation rec {
 | 
			
		|||
    kdelibs4support
 | 
			
		||||
    # kinit
 | 
			
		||||
    kwin
 | 
			
		||||
    kdecoration
 | 
			
		||||
    # kio
 | 
			
		||||
    # kguiaddons
 | 
			
		||||
    # kcoreaddons
 | 
			
		||||
| 
						 | 
				
			
			@ -57,19 +59,6 @@ stdenv.mkDerivation rec {
 | 
			
		|||
    wrapQtAppsHook
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  # preConfigure = ''
 | 
			
		||||
  #   # local modulepath=$(kf5-config --install module)
 | 
			
		||||
  #   # local datapath=$(kf5-config --install data)
 | 
			
		||||
  #   # local servicespath=$(kf5-config --install services)
 | 
			
		||||
  #   # substituteInPlace CMakeLists.txt \
 | 
			
		||||
  #   #   --replace "\''${MODULEPATH}" "$out/''${modulepath#/nix/store/*/}" \
 | 
			
		||||
  #   #   --replace "\''${DATAPATH}"   "$out/''${datapath#/nix/store/*/}"
 | 
			
		||||
 | 
			
		||||
  #   # substituteInPlace CMakeLists.txt \
 | 
			
		||||
  #   #   --replace "\''${MODULEPATH}" "$out/qt-5.15.3/plugins" \
 | 
			
		||||
  #   #   --replace "\''${DATAPATH}"   "$out/share"
 | 
			
		||||
  # '';
 | 
			
		||||
 | 
			
		||||
  postConfigure = ''
 | 
			
		||||
    substituteInPlace cmake_install.cmake \
 | 
			
		||||
      --replace "${kdelibs4support}" "$out"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -695,7 +695,7 @@ Notice how I am including all of my software here. It may be a big file, but hav
 | 
			
		|||
    macchina
 | 
			
		||||
    # Dev tools
 | 
			
		||||
    <<dev-tools>>
 | 
			
		||||
    <<lightlyshaders>>
 | 
			
		||||
    # <<lightlyshaders>>
 | 
			
		||||
    # <<librepresenter>>
 | 
			
		||||
 | 
			
		||||
    # (with import <nixpkgs> {}; libsForQt5.callPackage ../../bismuth {})
 | 
			
		||||
| 
						 | 
				
			
			@ -926,7 +926,7 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a
 | 
			
		|||
      nvtop
 | 
			
		||||
    # Dev tools
 | 
			
		||||
    <<dev-tools>>
 | 
			
		||||
    <<lightlyshaders>>
 | 
			
		||||
    # <<lightlyshaders>>
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  # nixpkgs.overlays = [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										24
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										24
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							| 
						 | 
				
			
			@ -8,11 +8,11 @@
 | 
			
		|||
        ]
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1666691950,
 | 
			
		||||
        "narHash": "sha256-0+gJByTBEY/GlXXaV6b40ZgRJ0tH7YZubLGCQdVJFww=",
 | 
			
		||||
        "lastModified": 1666784648,
 | 
			
		||||
        "narHash": "sha256-wVpP91AUThsQLWOh1V3Ecxo3QMjddJU0KE1Aa4u91fM=",
 | 
			
		||||
        "owner": "nix-community",
 | 
			
		||||
        "repo": "emacs-overlay",
 | 
			
		||||
        "rev": "87099c473e76a499ee78fcc4cda9f7c0a88db0ca",
 | 
			
		||||
        "rev": "52b4a58403f9103951631db70bcb740c8ca42a8d",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -96,11 +96,11 @@
 | 
			
		|||
        "wlroots": "wlroots"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1666704745,
 | 
			
		||||
        "narHash": "sha256-AuN21pv4nM/YqZWUS7wumg2o926M9J+AvnN97/1s7iQ=",
 | 
			
		||||
        "lastModified": 1666786777,
 | 
			
		||||
        "narHash": "sha256-FElsXIm/egsCKAiXL9YojcLE6Ge+QyS+1ndCOR97NN0=",
 | 
			
		||||
        "owner": "vaxerski",
 | 
			
		||||
        "repo": "Hyprland",
 | 
			
		||||
        "rev": "cdb331076afcd1069d4d62805c3b48d237cc0b05",
 | 
			
		||||
        "rev": "4aebb73de005e50bb08bacb0bb26ea89e0bd2818",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -115,11 +115,11 @@
 | 
			
		|||
        "nixpkgs": "nixpkgs"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1666697316,
 | 
			
		||||
        "narHash": "sha256-gwfIqjc6aNqrqZCYNpDWYBnNsEUbOuPIWxqkrxb2z2w=",
 | 
			
		||||
        "lastModified": 1666710838,
 | 
			
		||||
        "narHash": "sha256-61qrq34WmS3x+rzKUcmx8NtQJi8FmlJCL83ixGmsDVw=",
 | 
			
		||||
        "owner": "chriscochrun",
 | 
			
		||||
        "repo": "church-presenter",
 | 
			
		||||
        "rev": "2b84e05a0b508269d27ef4433ee89503ab452a71",
 | 
			
		||||
        "rev": "72a0c8c4c824ee08ea0d4a9f5def11aabbebec81",
 | 
			
		||||
        "type": "gitlab"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -215,11 +215,11 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixpkgs_3": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1666629043,
 | 
			
		||||
        "narHash": "sha256-Yoq6Ut2F3Ol73yO9hG93x6ts5c4F5BhKTbcF3DtBEAw=",
 | 
			
		||||
        "lastModified": 1666703756,
 | 
			
		||||
        "narHash": "sha256-GwpMJ1hT+z1fMAUkaGtvbvofJQwdVFDEGVhfE82+AUk=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "b39fd6e4edef83cb4a135ebef98751ce23becc33",
 | 
			
		||||
        "rev": "f994293d1eb8812f032e8919e10a594567cf6ef7",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -370,7 +370,7 @@
 | 
			
		|||
    # plasma5Packages.kirigami2
 | 
			
		||||
    sqlite
 | 
			
		||||
    fennel
 | 
			
		||||
    (with import <nixpkgs> {}; libsForQt5.callPackage ../../LightlyShaders {})
 | 
			
		||||
    # (with import <nixpkgs> {}; libsForQt5.callPackage ../../LightlyShaders {})
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  # nixpkgs.overlays = [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -385,7 +385,7 @@
 | 
			
		|||
    # plasma5Packages.kirigami2
 | 
			
		||||
    sqlite
 | 
			
		||||
    fennel
 | 
			
		||||
    (with import <nixpkgs> {}; libsForQt5.callPackage ../../LightlyShaders {})
 | 
			
		||||
    # (with import <nixpkgs> {}; libsForQt5.callPackage ../../LightlyShaders {})
 | 
			
		||||
    # (with import <nixpkgs> {}; libsForQt5.callPackage /home/chris/dev/church-presenter {})
 | 
			
		||||
 | 
			
		||||
    # (with import <nixpkgs> {}; libsForQt5.callPackage ../../bismuth {})
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue